Skip to content

A
amos-boot-biz
Commit 0e9c8a74 authored by 高建强's avatar 高建强
Browse files
Options

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

parents 086ed059 ffa379c1
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
amos-boot-system-equip/src/main/resources/mapper/FireFightingSystemMapper.xml
View file @ 0e9c8a74
...@@ -1917,7 +1917,7 @@ ...@@ -1917,7 +1917,7 @@
CONCAT('01#',wles.qr_code) fullqrCode, CONCAT('01#',wles.qr_code) fullqrCode,
wled.standard, wled.standard,
wle.img, wle.img,
wled.NAME equipmentName, wles.NAME equipmentName,
concat_ws('-',wlws.full_name,wled.area) as full_name, concat_ws('-',wlws.full_name,wled.area) as full_name,
wlws.name as belongBuildName, wlws.name as belongBuildName,
wlun.NAME unitName, wlun.NAME unitName,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment