From 91ebbdc5ef67699d166498f6cf5fcc21058817dd Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期二, 25 二月 2025 19:59:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/SystemUser.java |    5 +++--
 1 files changed, 3 insertions(+), 2 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 6a2f40d..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;
 
@@ -114,7 +115,7 @@
 	 */
 	@TableField("street_id")
 	@ApiModelProperty(value = "街道ID")
-	private Integer streetId;
+	private String streetId;
 	/**
 	 * 社区
 	 */
@@ -126,7 +127,7 @@
 	 */
 	@TableField("community_id")
 	@ApiModelProperty(value = "社区ID")
-	private Integer communityId;
+	private Long communityId;
 	/**
 	 * 状态(1=正常,2=冻结,3=删除)
 	 */

--
Gitblit v1.7.1