From 212aa4ae1f54fe4d3e51b9695224f9f86cd1bd22 Mon Sep 17 00:00:00 2001
From: java110 <928255095@qq.com>
Date: 星期二, 11 七月 2023 10:58:48 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity

---
 java110-bean/src/main/java/com/java110/dto/community/CommunityLocationDto.java |   70 +++++++++++++++++++++++++++++++----
 1 files changed, 62 insertions(+), 8 deletions(-)

diff --git a/java110-bean/src/main/java/com/java110/dto/community/CommunityLocationDto.java b/java110-bean/src/main/java/com/java110/dto/community/CommunityLocationDto.java
index 0efa3be..aa76e84 100755
--- a/java110-bean/src/main/java/com/java110/dto/community/CommunityLocationDto.java
+++ b/java110-bean/src/main/java/com/java110/dto/community/CommunityLocationDto.java
@@ -15,19 +15,42 @@
  **/
 public class CommunityLocationDto extends PageDto implements Serializable {
 
-    private String locationName;
-    private String locationId;
-    private String locationType;
-    private String communityId;
-    private String locationTypeName;
-    private String locationObjId;
-    private String locationObjName;
+    public static final String LOCAL_TYPE_COMMUNITY = "1000";//灏忓尯
+    public static final String LOCAL_TYPE_UNIT = "2000";//灏忓尯
 
+//    1000	灏忓尯
+//2000	鍗曞厓
+//3000	鎴垮眿
+//4000	宀椾涵
+//5000	閮ㄩ棬
+//6000	妤兼爧
+//7000	鍋滆溅鍦�
+
+    private String locationName;
+
+    private String locationId;
+
+    private String locationType;
+
+    private String communityId;
+
+    private String locationTypeName;
+
+    private String locationObjId;
+
+    private String locationObjName;
 
     private Date createTime;
 
     private String statusCd = "0";
 
+    private String unitId;
+
+    private String floorId;
+
+    private String paId;
+
+    private String boxId;
 
     public String getLocationName() {
         return locationName;
@@ -60,7 +83,6 @@
     public void setCommunityId(String communityId) {
         this.communityId = communityId;
     }
-
 
     public Date getCreateTime() {
         return createTime;
@@ -101,4 +123,36 @@
     public void setLocationObjName(String locationObjName) {
         this.locationObjName = locationObjName;
     }
+
+    public String getFloorId() {
+        return floorId;
+    }
+
+    public void setFloorId(String floorId) {
+        this.floorId = floorId;
+    }
+
+    public String getUnitId() {
+        return unitId;
+    }
+
+    public void setUnitId(String unitId) {
+        this.unitId = unitId;
+    }
+
+    public String getPaId() {
+        return paId;
+    }
+
+    public void setPaId(String paId) {
+        this.paId = paId;
+    }
+
+    public String getBoxId() {
+        return boxId;
+    }
+
+    public void setBoxId(String boxId) {
+        this.boxId = boxId;
+    }
 }

--
Gitblit v1.8.0