-
# Conflicts: # src/main/java/com/bsth/data/gpsdata_v2/DataHandleProcess.java
-
1、调度执勤日报修改人员，车辆时，初始会修改已有车辆人员配置（如套跑某个班次的车辆不一样，初始时会修改），修改saPlanInfoEdit2指令 2、调度执勤日报显示中ngRepeat的问题，修改指定track by 3、排班明细修改班次时，修改去除工号的前缀
-
…trol into qingpu_20180808 m
-
2、排班明细修改页面保存搜索条件
-
…trol into qingpu_20180808
-
…trol into qingpu_20180808
-
# Conflicts: # src/main/resources/application-prod.properties # src/main/resources/datatools/config-prod.properties # src/main/resources/ms-jdbc.properties # src/main/resources/static/index.html # src/main/resources/static/login.html # src/main/resources/static/metronic_v4.5.4/plugins/echarts4/echarts.js # src/main/resources/static/metronic_v4.5.4/plugins/echarts4/echarts.min.js # src/main/resources/static/real_control_v2/main.html # src/main/resources/traffic-jdbc.properties