Merge branch 'dev' of http://192.168.1.43:3000/v2/zd-parents into dev

zd-modules/zd-algorithm/src/main/resources/mapper/fire/FireDeviceMapper.xml

@@ -36,12 +36,11 @@
                fd.create_by,
                fd.create_time,
                ls.name      subjectName,
-               lsl.room,
-               sd.dept_name buildName
+               fl.room_num room,
+               ( select bf.`name` from lab_build_floor bf where bf.type=2 and bf.id=fl.build_id ) buildName
         from hardware_fire_device fd
                  LEFT JOIN lab_subject ls on fd.subject_id = ls.id
-                 LEFT JOIN lab_subject_layout lsl on lsl.floor_id = ls.layout_id and ls.id = fd.subject_id
-                 LEFT JOIN sys_dept sd on ls.build_id = sd.dept_id and ls.id = fd.subject_id
+                 LEFT JOIN lab_build_floor_layout fl on fl.sub_id=fd.subject_id
     </sql>
 
     <select id="selectHardwareFireDeviceList" parameterType="com.zd.algorithm.api.fire.entity.vo.HardwareFireDeviceVO"