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

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

@@ -752,7 +752,7 @@
             es.`name`,
             es.`name` AS aliasname,
             es.`code`,
-            ed.`name` AS categoryname,
+            e.`name` AS categoryname,
 			ed.`code` AS categorycode,
             ( SELECT GROUP_CONCAT( url ) FROM wl_upload_file WHERE file_type = 'image' AND object_type = 'equipment' AND object_id = ed.id ) AS img,
             es.iot_code AS iotcode,
@@ -774,6 +774,7 @@
         FROM
             wl_equipment_specific es
             LEFT JOIN wl_equipment_detail ed ON es.equipment_detail_id = ed.id
+            LEFT JOIN wl_equipment e ON ed.equipment_id = e.id
             LEFT JOIN wl_stock_detail sd ON sd.equipment_specific_id = es.id
             LEFT JOIN wl_warehouse_structure ws ON ws.id = sd.warehouse_structure_id
             LEFT JOIN wl_area a ON es.area_id = a.id

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

@@ -2201,7 +2201,7 @@
                     and fs.biz_org_code like concat(#{bizOrgCode}, '%')
                 </if>
             </where>
-        ORDER BY stateDesc
+        ORDER BY stateDesc, `fs`.`id`
     </select>
 
     <select id="getEquipAlarmInfoNum" resultType="java.util.Map">