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

9c21a9cd · 宋文杰 · 6db59f7f · c676f6ce · 9c21a9cd · 9c21a9cd
--- 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/emergency/应急队伍装备信息.sql
+++ b/db/emergency/应急队伍装备信息.sql
--- a/db/emergency/资源库.sql
+++ b/db/emergency/资源库.sql
--- a/pom.xml
+++ b/pom.xml
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/controller/EmergencyAddCheckController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/controller/EmergencyAddCheckController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/controller/EmergencyCarController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/controller/EmergencyCarController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/controller/EmergencyEquipmentController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/controller/EmergencyEquipmentController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/controller/EmergencyMaterialController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/controller/EmergencyMaterialController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/controller/EmergencyTeamController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/controller/EmergencyTeamController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/controller/EmergencyTeamEquipmentController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/controller/EmergencyTeamEquipmentController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/controller/MaterialHouseController.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/controller/MaterialHouseController.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/dto/CarCoordinateDto.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/dto/CarCoordinateDto.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/dto/EquipmentCoordinateDto.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/dto/EquipmentCoordinateDto.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/dto/MaterialCoordinateDto.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/dto/MaterialCoordinateDto.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/dto/MaterialHouseCoordinateDto.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/dto/MaterialHouseCoordinateDto.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/dto/TeamCoordinateDto.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/dto/TeamCoordinateDto.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/dto/TeamEquipmentCoordinateDto.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/dto/TeamEquipmentCoordinateDto.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/dto/TeamEquipmentInfoDto.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/dto/TeamEquipmentInfoDto.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/entity/EmergencyCar.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/entity/EmergencyCar.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/entity/EmergencyEquipment.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/entity/EmergencyEquipment.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/entity/EmergencyMaterial.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/entity/EmergencyMaterial.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/entity/EmergencyTeam.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/entity/EmergencyTeam.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/entity/EmergencyTeamEquipment.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/entity/EmergencyTeamEquipment.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/entity/MaterialHouse.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/entity/MaterialHouse.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/mapper/EmergencyCarMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/mapper/EmergencyCarMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/mapper/EmergencyEquipmentMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/mapper/EmergencyEquipmentMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/mapper/EmergencyMaterialMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/mapper/EmergencyMaterialMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/mapper/EmergencyTeamEquipmentMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/mapper/EmergencyTeamEquipmentMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/mapper/EmergencyTeamMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/mapper/EmergencyTeamMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/mapper/MaterialHouseMapper.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/mapper/MaterialHouseMapper.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/EmergencyCarService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/EmergencyCarService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/EmergencyEquipmentService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/EmergencyEquipmentService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/EmergencyMaterialService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/EmergencyMaterialService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/EmergencyTeamEquipmentService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/EmergencyTeamEquipmentService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/EmergencyTeamService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/EmergencyTeamService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/MaterialHouseService.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/MaterialHouseService.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/impl/EmergencyCarServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/impl/EmergencyCarServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/impl/EmergencyEquipmentServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/impl/EmergencyEquipmentServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/impl/EmergencyMaterialServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/impl/EmergencyMaterialServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/impl/EmergencyTeamEquipmentServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/impl/EmergencyTeamEquipmentServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/impl/EmergencyTeamServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/impl/EmergencyTeamServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/impl/MaterialHouseServiceImpl.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/service/impl/MaterialHouseServiceImpl.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/vo/EmergencyMaterialAndEquipmentVo.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/module/emergency/vo/EmergencyMaterialAndEquipmentVo.java
--- a/src/main/java/com/elephant/framework/galaxy/aroad/util/LocationUtil.java
+++ b/src/main/java/com/elephant/framework/galaxy/aroad/util/LocationUtil.java
--- a/src/main/resources/mapper/emergency/EmergencyCarMapper.xml
+++ b/src/main/resources/mapper/emergency/EmergencyCarMapper.xml
--- a/src/main/resources/mapper/emergency/EmergencyEquipmentMapper.xml
+++ b/src/main/resources/mapper/emergency/EmergencyEquipmentMapper.xml
--- a/src/main/resources/mapper/emergency/EmergencyMaterialMapper.xml
+++ b/src/main/resources/mapper/emergency/EmergencyMaterialMapper.xml
--- a/src/main/resources/mapper/emergency/EmergencyTeamEquipmentMapper.xml
+++ b/src/main/resources/mapper/emergency/EmergencyTeamEquipmentMapper.xml
--- a/src/main/resources/mapper/emergency/EmergencyTeamMapper.xml
+++ b/src/main/resources/mapper/emergency/EmergencyTeamMapper.xml
--- a/src/main/resources/mapper/emergency/MaterialHouseMapper.xml
+++ b/src/main/resources/mapper/emergency/MaterialHouseMapper.xml