解决冲突

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_alarm.xml

@@ -105,7 +105,7 @@
 		END AS type,
 		wlesa.update_date as createDate,
 		wlesa.recovery_date as recoveryDate,
-		wws.full_name as warehouseStructureName,
+		CONCAT(IFNULL(wws.full_name,''),' ',IFNULL(wlsd.description,'')) as warehouseStructureName,
 		(
 		SELECT
 		group_concat(DISTINCT f.`name`)

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_equipment_specific.xml

@@ -41,7 +41,7 @@
         manage.name as system_name
         from
         wl_stock_detail as sto
-        left join wl_equipment_specific as spe on sto.qr_code = spe.qr_code
+        left join wl_equipment_specific as spe on sto.equipment_specific_id = spe.id
         <if test="equipmentId != null and equipmentId!='null' ">
             left join f_equipment_fire_equipment as fire on spe.id = fire.fire_equipment_id
         </if>

YeeAmosFireAutoSysStart/src/main/resources/db/mapper/dbTemplate_fire_equip.xml

@@ -164,7 +164,7 @@
         WHEN 'false' THEN '否'
         ELSE ind.value END 'e_value',
         ein.unit as eq_point_unit,
-        str.full_name as source_name,
+        CONCAT(IFNULL(str.full_name,''),' ',IFNULL(sto.description,'')) as source_name,
         (
         SELECT
         group_concat(DISTINCT f.`name`)