潘钊 / bsth_control · Commits

# 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

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang

计算添加实发添加

http://222.66.0.204:8090/panzhaov5/bsth_control into minhang