-
…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
-
# Conflicts: # src/main/resources/application-prod.properties
-
1、搜索框带箭头，点击弹出排序选项 2、点击排序选项，弹出排序字段选项对话框，对话框内部使用saOrderOption自定义指令
-
2、治理规则代码，将drl文件以kBase1，kBase2，KBase3前缀命名，将所有drools的java代码移动至com.bsth.service.scedule.impl.plan中 3、drl文件名和com.bsth.service.schedule.impl.plan下的包名一级一级对应，前缀kBase1、kBase2、kBase3和MyDroolsConfiguration中的定义对应
-
# Conflicts: # src/main/java/com/bsth/data/gpsdata_v2/utils/GpsDataRecovery.java # src/main/java/com/bsth/repository/sys/ResourceRepository.java # src/main/java/com/bsth/service/sys/impl/RoleServiceImpl.java # src/main/resources/application-prod.properties # src/main/resources/static/pages/permission/resource/list.html # src/main/resources/traffic-jdbc.properties