-
# Conflicts: # src/main/java/com/bsth/XDApplication.java # src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController_facade.java # src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java # src/main/resources/datatools/ktrs/ttinfodetailoutputforedit.ktr # src/main/resources/dubbo/config-dev.properties # src/main/resources/dubbo/config-prod.properties
-
# Conflicts: # src/main/java/com/bsth/XDApplication.java # src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController_facade.java # src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java # src/main/resources/datatools/ktrs/ttinfodetailoutputforedit.ktr # src/main/resources/dubbo/config-dev.properties # src/main/resources/dubbo/config-prod.properties
-
# Conflicts: # src/main/java/com/bsth/XDApplication.java # src/main/java/com/bsth/controller/schedule/core/TTInfoDetailController_facade.java # src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java # src/main/resources/datatools/ktrs/ttinfodetailoutputforedit.ktr # src/main/resources/dubbo/config-dev.properties # src/main/resources/dubbo/config-prod.properties
-
新增油电路单统计表
-
修改saPlanInfoEdit2指令，修改初始化车辆人员数据逻辑，解决页面需要连续选择两次以上才会修改数据的bug
-
修改saPlanInfoEdit2指令，修改初始化车辆人员数据逻辑，解决页面需要连续选择两次以上才会修改数据的bug
-
1、调度执勤日报修改人员，车辆时，初始会修改已有车辆人员配置（如套跑某个班次的车辆不一样，初始时会修改），修改saPlanInfoEdit2指令 2、调度执勤日报显示中ngRepeat的问题，修改指定track by 3、排班明细修改班次时，修改去除工号的前缀
-
2、修改dubbo相关配置文件，添加spring.dubbo.protocol相关配置
-
2、修改dubbo相关配置文件，添加spring.dubbo.protocol相关配置
-
1、调度执勤日报修改人员，车辆时，初始会修改已有车辆人员配置（如套跑某个班次的车辆不一样，初始时会修改），修改saPlanInfoEdit2指令 2、调度执勤日报显示中ngRepeat的问题，修改指定track by 3、排班明细修改班次时，修改去除工号的前缀
-
修改pom.xml关于jaxb的插件设置，添加<phase>none</phase>，防止每次mvn compile重新生成相关的xsd映射的java文件
-
添加车辆同步接口web服务
