Merge branch 'han' of uskycloud/usky-modules into server-165

service-iot/service-iot-biz/src/main/resources/mapper/iot/BaseFacilityTypeMapper.xml

@@ -40,7 +40,7 @@
             <if test="tenantId != null and tenantId != ''">
                 and e.tenant_id = #{tenantId}
             </if>
-                and e.status = 0
+                and e.facility_status = 0
         </where>
         GROUP BY d.id
     </select>
@@ -53,7 +53,7 @@
             <if test="tenantId != null and tenantId != ''">
                 and e.tenant_id = #{tenantId}
             </if>
-            and e.status = 1
+            and e.facility_status = 1
         </where>
         GROUP BY d.id
     </select>
@@ -66,7 +66,7 @@
             <if test="tenantId != null and tenantId != ''">
                 and e.tenant_id = #{tenantId}
             </if>
-            and e.status = 2
+            and e.facility_status = 2
         </where>
         GROUP BY d.id
     </select>