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

0e9c8a74 · 高建强 · 086ed059 · ffa379c1 · 0e9c8a74
Commit 0e9c8a74 authored Mar 02, 2023 by 高建强
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 1 deletion

FireFightingSystemMapper.xml ...ip/src/main/resources/mapper/FireFightingSystemMapper.xml +1 -1

No files found.
--- a/amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
+++ b/amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
@@ -1917,7 +1917,7 @@
            CONCAT('01#',wles.qr_code) fullqrCode,
            wled.standard,
            wle.img,
-            wled.NAME equipmentName,
+            wles.NAME equipmentName,
            concat_ws('-',wlws.full_name,wled.area) as full_name,
            wlws.name as belongBuildName,
            wlun.NAME unitName,