-
…trol into pudong_jdk8_wvp
-
2、国际化改造：排班规则管理前端页面改造
-
# Conflicts: # src/main/resources/static/other/video/video.html # src/main/resources/static/other/video/video.js
-
…trol into pudong_jdk8_wvp
-
2、国际化改造，车辆配置前端页面改造
-
…trol into pudong_jdk8_wvp
-
2、国际化改造：saSelect5指令修正，以及添加width属性 3、国际化改造：orderOptionOpen指令修正 4、国际化改造：人员基础信息页面修正
-
# Conflicts: # src/main/resources/static/pages/permission/authorize_all/user_auth.html # src/main/resources/static/real_control_v2/js/data/json/north_toolbar.json # src/main/resources/static/real_control_v2/js/north/toolbar.js # src/main/resources/static/real_control_v2/js/utils/svg_chart.js # src/main/resources/static/real_control_v2/mapmonitor/fragments/map_infowindow.html # src/main/resources/static/real_control_v2/mapmonitor/js/map_overlay_manager.js
