From d7a8baeff8b0e68c54a959e5f46f639c54aad1d1 Mon Sep 17 00:00:00 2001
From: 罗元桥 <2376770955@qq.com>
Date: 星期一, 27 九月 2021 17:15:29 +0800
Subject: [PATCH] Merge branch 'test_bak' into 'master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDO.java |   22 ++++++++++++++++------
 1 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDO.java b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDO.java
index 07ab689..f8ba627 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDO.java
@@ -1,10 +1,11 @@
 package com.panzhihua.service_community.model.dos;
 
-import com.baomidou.mybatisplus.annotation.*;
-import lombok.Data;
-
 import java.io.Serializable;
 import java.util.Date;
+
+import com.baomidou.mybatisplus.annotation.*;
+
+import lombok.Data;
 
 /**
  * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -20,7 +21,7 @@
     /**
      * community_id
      */
-    @TableId(type=IdType.AUTO)
+    @TableId(type = IdType.AUTO)
     private Long communityId;
 
     /**
@@ -79,6 +80,16 @@
      */
     private String contactsPhone;
 
+    /** 社区总人口 */
+    private Integer totalUser;
+    /** 社区书记-用户ID */
+    private Long managerId;
+    /** 社区书记_名称 */
+    private String managerName;
+    /** 社区介绍 */
+    private String introduce;
+    /** 层次递归字段(省>市>区县>街道>社区) */
+    private String path;
     /**
      * 超管账号
      */
@@ -97,7 +108,6 @@
     /**
      * 街道ID
      */
-    private Integer streetId;
-
+    private Long streetId;
 
 }

--
Gitblit v1.7.1