1.消火栓按钮放到消防给水系统中

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

@@ -770,7 +770,6 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
         if (SystemTypeEnum.fireAlarmSys.getCode().equals(systemCode)) {
             data = fireFightingSystemMapper.fireAlarmSysEquipmentNumber();
             this.putAll(data, fireFightingSystemMapper.fireAlarmSysIndexNumber());
-            this.putAll(data, fireFightingSystemMapper.fireWaterSysHydrant());
         } else if (SystemTypeEnum.fireCAFSSys.getCode().equals(systemCode)) {
             data = fireFightingSystemMapper.getFireCafsSystem();
         } else if (SystemTypeEnum.fireONLSys.getCode().equals(systemCode)) {
@@ -786,6 +785,7 @@ public class FireFightingSystemServiceImpl extends ServiceImpl<FireFightingSyste
             data = fireFightingSystemMapper.fireWaterSysCollectingDevice();
             this.putAll(data, fireFightingSystemMapper.fireWaterSysPool());
             this.putAll(data, fireFightingSystemMapper.fireWaterSysWaterPump());
+            this.putAll(data, fireFightingSystemMapper.fireWaterSysHydrant());
         } else {
             data = fireFightingSystemMapper.otherSysIndexNumAndTotal();
         }