From f195988d576e52a30dfc15904cba3a79675f7dca Mon Sep 17 00:00:00 2001 From: luofl <1442745593@qq.com> Date: 星期一, 24 二月 2025 21:22:51 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/SystemUser.java | 18 +++++++++--------- 1 files changed, 9 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..6a2f40d 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 @@ -89,7 +89,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 +110,11 @@ @ApiModelProperty(value = "街道") private String street; /** - * 街道编号 + * 街道ID */ - @TableField("street_code") - @ApiModelProperty(value = "街道编号") - private String streetCode; + @TableField("street_id") + @ApiModelProperty(value = "街道ID") + private Integer streetId; /** * 社区 */ @@ -122,11 +122,11 @@ @ApiModelProperty(value = "社区") private String community; /** - * 社区编号 + * 社区ID */ - @TableField("community_code") - @ApiModelProperty(value = "社区编号") - private String communityCode; + @TableField("community_id") + @ApiModelProperty(value = "社区ID") + private Integer communityId; /** * 状态(1=正常,2=冻结,3=删除) */ -- Gitblit v1.7.1