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

service-iot/service-iot-biz/src/main/java/com/usky/iot/domain/BaseGgpFacility.java

@@ -167,5 +167,10 @@ public class BaseGgpFacility implements Serializable {
      */
     private String facilityAddress;
 
+    /**
+     * 设施备注
+     */
+    private String facilityDesc;
+
 
 }

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

@@ -33,6 +33,7 @@
         <result column="update_person" property="updatePerson" />
         <result column="creator" property="creator" />
         <result column="facility_address" property="facilityAddress" />
+        <result column="facility_desc" property="facilityDesc" />
     </resultMap>
 
 </mapper>