潘钊 / bsth_control · Commits

2.调度员点击安全驾驶反馈至dsm

into pudong_jdk8

# Conflicts:
#	src/main/java/com/bsth/service/impl/LineServiceImpl.java
#	src/main/java/com/bsth/service/impl/StationRouteServiceImpl.java

1.新增上下行批量匹配修改
2.检测更新修改
3.单个站点智能匹配替换

# Conflicts:
#	src/main/java/com/bsth/data/report_register/entity/ReportRegister.java
#	src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java

# Conflicts:
#	src/main/java/com/bsth/data/report_register/entity/ReportRegister.java
#	src/main/java/com/bsth/service/realcontrol/impl/ScheduleRealInfoServiceImpl.java

# Conflicts:
#	src/main/java/com/bsth/service/calc/impl/CalcWaybillServiceImpl.java