Merge remote-tracking branch 'origin/dev' into dev

# Conflicts: # db/aroad.sql

Merge remote-tracking branch 'origin/dev' into dev
bfc4b49b · 张龙发 · 2238c7c6 · f3d1ecd6 · bfc4b49b · bfc4b49b
--- a/db/aroad.sql
+++ b/db/aroad.sql
--- a/db/info.sql
+++ b/db/info.sql
--- a/db/traffic/初始化菜单.sql
+++ b/db/traffic/初始化菜单.sql
--- a/pom.xml
+++ b/pom.xml
--- a/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/BaseRoadToll.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/BaseRoadToll.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/BaseRoadToll_String.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/BaseRoadToll_String.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/BasicTunnel.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/BasicTunnel.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/EsUtil_fanshe.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/EsUtil_fanshe.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/LuKeBridge.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/LuKeBridge.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/LuKeHighWay.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/LuKeHighWay.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/ReadElasticsearch.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/bigdata/ReadElasticsearch.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/config/FastClientImporter.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/config/FastClientImporter.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/exception/UploadFileException.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/exception/UploadFileException.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/dto/SaveAttendanceDto.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/attendance/dto/SaveAttendanceDto.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/common/controller/FileUploadController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/common/controller/FileUploadController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/info/controller/InfoInformationsController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/info/controller/InfoInformationsController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/info/dto/InfoDto.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/info/dto/InfoDto.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/info/dto/InfoInformationsDto.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/info/dto/InfoInformationsDto.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/info/entity/InfoInformations.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/info/entity/InfoInformations.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/info/entity/InfoReceivers.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/info/entity/InfoReceivers.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/info/mapper/InfoInformationsMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/info/mapper/InfoInformationsMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/info/service/InfoInformationsService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/info/service/InfoInformationsService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/info/service/impl/InfoInformationsServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/info/service/impl/InfoInformationsServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/controller/TrafficRoadsectionController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/controller/TrafficRoadsectionController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/controller/TrafficRouteController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/controller/TrafficRouteController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/controller/TrafficSpotController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/controller/TrafficSpotController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/mapper/TrafficRoadsectionMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/mapper/TrafficRoadsectionMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/mapper/TrafficRouteMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/mapper/TrafficRouteMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/mapper/TrafficSpotMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/mapper/TrafficSpotMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/service/TrafficRoadsectionService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/service/TrafficRoadsectionService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/service/TrafficRouteService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/service/TrafficRouteService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/service/TrafficSpotService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/service/TrafficSpotService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/service/impl/TrafficRoadsectionServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/service/impl/TrafficRoadsectionServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/service/impl/TrafficRouteServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/service/impl/TrafficRouteServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/service/impl/TrafficSpotServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/traffic/service/impl/TrafficSpotServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/entity/ZhjcXmjcZtxmDdjgl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/entity/ZhjcXmjcZtxmDdjgl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/entity/ZhjcXmjcZtxmDtl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/entity/ZhjcXmjcZtxmDtl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/entity/ZhjcXmjcZtxmWq.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhjc/entity/ZhjcXmjcZtxmWq.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/controller/ZhjgDckhRwController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/zhjg/controller/ZhjgDckhRwController.java
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
--- a/src/main/resources/mapper/info/InfoInformationsMapper.xml
+++ b/src/main/resources/mapper/info/InfoInformationsMapper.xml
--- a/src/main/resources/mapper/system/UserMapper.xml
+++ b/src/main/resources/mapper/system/UserMapper.xml
--- a/src/main/resources/mapper/traffic/TrafficRoadsectionMapper.xml
+++ b/src/main/resources/mapper/traffic/TrafficRoadsectionMapper.xml
--- a/src/main/resources/mapper/traffic/TrafficRouteMapper.xml
+++ b/src/main/resources/mapper/traffic/TrafficRouteMapper.xml
--- a/src/main/resources/mapper/traffic/TrafficSpotMapper.xml
+++ b/src/main/resources/mapper/traffic/TrafficSpotMapper.xml
--- a/src/main/resources/mapper/zhjc/ZhjcXmjcZtxmDdjglMapper.xml
+++ b/src/main/resources/mapper/zhjc/ZhjcXmjcZtxmDdjglMapper.xml
--- a/src/main/resources/mapper/zhjc/ZhjcXmjcZtxmDtlMapper.xml
+++ b/src/main/resources/mapper/zhjc/ZhjcXmjcZtxmDtlMapper.xml
--- a/src/main/resources/mapper/zhjc/ZhjcXmjcZtxmWqMapper.xml
+++ b/src/main/resources/mapper/zhjc/ZhjcXmjcZtxmWqMapper.xml