Merge branch 'developer' of http://172.16.10.76/moa/amos-boot-biz into developer

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/service/impl/ConfirmAlarmServiceImpl.java

@@ -261,7 +261,7 @@ public class ConfirmAlarmServiceImpl extends ServiceImpl<ConfirmAlarmMapper, Equ
         } catch (Exception e) {
             log.error("查询机场人员为空，检查机场人员是否绑定单位！");
         }
-        confirmAlamVo.setFireLocation(ent.getAlarmPlace());
+        confirmAlamVo.setFireLocation(ent.getLocation());
         List<UserDto> infoList = equipmentSpecificSerivce.getEquipSpecificLocationInfo(ent.getEquipmentSpecificId(), FIELD_NAME.split(","));
         if (CollectionUtils.isNotEmpty(infoList)) {
             infoList.stream().forEach(dto -> {