Merge remote-tracking branch 'origin/develop_dl_3.6.0.6' into develop_dl_plan6

amos-boot-module/amos-boot-module-biz/amos-boot-module-equip-biz/src/main/java/com/yeejoin/equipmanage/mapper/FireFightingSystemMapper.java

@@ -631,4 +631,7 @@ public interface FireFightingSystemMapper extends BaseMapper<FireFightingSystemE
     Long selectEquipCountBySystemId(Long id);
 
     String selectEquipSystemType(String code);
+
+    Map<String, Object> getWaterlevelUnit();
+
 }

amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml

@@ -5436,4 +5436,8 @@
     </select>
 
 
+
+    <select id="getWaterlevelUnit" resultType="java.util.Map">
+        SELECT unit FROM `wl_equipment_index`   WHERE  name_key = 'FHS_FirePoolDevice_WaterLevel'
+    </select>
 </mapper>