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

47f453e2 · 朱运伟 · 3fe27e17 · 0a70c555 · 47f453e2 · 47f453e2
--- a/db/emergency/应急物资.sql
+++ b/db/emergency/应急物资.sql
--- a/db/emergency/应急装备.sql
+++ b/db/emergency/应急装备.sql
--- a/db/emergency/应急车辆.sql
+++ b/db/emergency/应急车辆.sql
--- a/db/emergency/应急队伍.sql
+++ b/db/emergency/应急队伍.sql
--- a/db/emergency/应急队伍装备信息.sql
+++ b/db/emergency/应急队伍装备信息.sql
--- a/db/event.sql
+++ b/db/event.sql
--- a/db/info.sql
+++ b/db/info.sql
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/controller/EmergencyEventController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/controller/EmergencyEventController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/controller/EvendealController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/controller/EvendealController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/entity/EmergencyEvent.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/entity/EmergencyEvent.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/entity/Evendeal.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/entity/Evendeal.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/mapper/EmergencyEventMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/mapper/EmergencyEventMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/mapper/EvendealMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/mapper/EvendealMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/EmergencyEventService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/EmergencyEventService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/EvendealService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/EvendealService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/impl/EmergencyEventServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/impl/EmergencyEventServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/impl/EvendealServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergencyevent/service/impl/EvendealServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/system/mapper/DeptMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/system/mapper/DeptMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/system/service/DeptService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/system/service/DeptService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/system/service/impl/DeptServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/system/service/impl/DeptServiceImpl.java
--- a/src/main/resources/mapper/emergencyevent/EmergencyEventMapper.xml
+++ b/src/main/resources/mapper/emergencyevent/EmergencyEventMapper.xml
--- a/src/main/resources/mapper/emergencyevent/EvendealMapper.xml
+++ b/src/main/resources/mapper/emergencyevent/EvendealMapper.xml
--- a/src/main/resources/mapper/system/DeptMapper.xml
+++ b/src/main/resources/mapper/system/DeptMapper.xml