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

service-iot/service-iot-biz/src/main/java/com/usky/iot/service/vo/BaseGgpFacilityTypeNumVO.java

@@ -9,6 +9,10 @@ public class BaseGgpFacilityTypeNumVO {
      * 设施类型名称
      */
     private String typeName;
+    /**
+     * 设施类型编码
+     */
+    private String typeCode;
     /**
      * 设施类型图片
      */

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

@@ -20,7 +20,8 @@
         <result column="tenant_id" property="tenantId" />
     </resultMap>
     <select id="typeNumList" resultType="com.usky.iot.service.vo.BaseGgpFacilityTypeNumVO">
-        SELECT d.id,d.type_name as typeName,d.type_img as typeImg,IF(facility_type IS NULL,0,COUNT(*)) AS
+        SELECT d.id,d.type_name as typeName,d.type_code as typeCode,d.type_img as typeImg,IF(facility_type IS
+        NULL,0,COUNT(*)) AS
         typeFacilityNum
         FROM base_facility_type d
         LEFT JOIN base_ggp_facility e ON e.facility_type = d.type_code