From 06180fa3c8ee17d731561b88897fa18b9f8cf228 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期五, 04 十一月 2022 17:53:50 +0800
Subject: [PATCH] Merge branch 'huacheng_test' into local_20221104
---
springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/model/dos/ComActDO.java | 30 +++++++++++++++++++++++++-----
1 files changed, 25 insertions(+), 5 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..a93397b 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.ASSIGN_ID)
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,16 @@
/**
* 街道ID
*/
- private Integer streetId;
+ private Long streetId;
+ /**
+ * 明文密码
+ */
+ private String plaintextPassword;
+
+ private String appId;
+
+ @TableField(exist = false)
+ private String solvePhone;
}
--
Gitblit v1.7.1