From 2f084c24fcc1c42e401edde4c8c6939d53c94764 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期二, 25 二月 2025 00:08:43 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/SystemUser.java | 19 ++++++++++---------
1 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/SystemUser.java b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/SystemUser.java
index a41de57..447ba36 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/SystemUser.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/SystemUser.java
@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import org.apache.xalan.templates.VarNameCollector;
import java.time.LocalDateTime;
@@ -89,7 +90,7 @@
* 账号层级（1=市级账号，2=区县账号，3=街道账号，4=社区账号）
*/
@TableField("account_level")
- @ApiModelProperty(value = "账号层级（1=市级账号，2=区县账号，3=街道账号，4=社区账号）", required = true)
+ @ApiModelProperty(value = "账号层级（1=市级账号，2=区县账号，3=街道账号，4=社区账号，5=党员账号）", required = true)
private Integer accountLevel;
/**
* 所属区县
@@ -110,11 +111,11 @@
@ApiModelProperty(value = "街道")
private String street;
/**
- * 街道编号
+ * 街道ID
*/
- @TableField("street_code")
- @ApiModelProperty(value = "街道编号")
- private String streetCode;
+ @TableField("street_id")
+ @ApiModelProperty(value = "街道ID")
+ private String streetId;
/**
* 社区
*/
@@ -122,11 +123,11 @@
@ApiModelProperty(value = "社区")
private String community;
/**
- * 社区编号
+ * 社区ID
*/
- @TableField("community_code")
- @ApiModelProperty(value = "社区编号")
- private String communityCode;
+ @TableField("community_id")
+ @ApiModelProperty(value = "社区ID")
+ private Long communityId;
/**
* 状态（1=正常，2=冻结，3=删除）
*/
--
Gitblit v1.7.1