潘钊 / bsth_control · Commits

Commit 933fcbe66f3fd836a839e7540eea8bbb4c11b256

Authored by 潘钊
2 parents 30282880 3c3df9d7
build: skipped

Merge branch 'minhang' of http://222.66.0.204:8090/panzhaov5/bsth_control into minhang 

# Conflicts:
#	src/main/java/com/bsth/controller/realcontrol/summary/DestroySituationController.java
#	src/main/java/com/bsth/data/summary/service/DestroySituationService.java
#	src/main/java/com/bsth/data/summary/service/impl/DestroySituationServiceImpl.java
#	src/main/resources/static/pages/summary/destory_sch_detail/list.html
.gitlab-ci.yml not found in this commit
Latest builds
 
Status Build ID Ref Stage Name Duration Finished at