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

README.md

-# 机场消防监管_特种设备监管V1.0.0
\ No newline at end of file
+# 电力3.7+版本及中心级系统开发分支
+------2023-02-02-----------------------
+
+电力3.7+版本及中心级系统开发分支develop_dl_plan6_temp
\ No newline at end of file

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

@@ -4683,7 +4683,7 @@
         where
             -- or ei.equipment_index_key = 'FHS_WirelessliquidDetector_WaterLevel' 此处由于单位会出现多个，所以无法确定选择哪一个，所以此处默认用一个指标的单位进行单位换算
         ei.equipment_index_key = 'FHS_FirePoolDevice_WaterLevel'
-        and FIND_IN_SET( ei.equipment_specific_id, rp.level_device_id) > 0) AS 'unit',
+        and FIND_IN_SET( ei.equipment_specific_id, rp.level_device_id) > 0 limit 1) AS 'unit',
         IFNULL( rp.volume, 0 ) AS volume,
         ec.image,
         r.resource_type,