From dbaee59a4cc2b5498af17eda8bb14eb0020e4063 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 23 五月 2025 22:41:02 +0800
Subject: [PATCH] Merge remote-tracking branch '喜望/dev-2.0.1' into dev-2.0.1
---
springcloud_k8s_panzhihuazhihuishequ/service_sangeshenbian/src/main/java/com/panzhihua/sangeshenbian/model/entity/SystemUser.java | 16 +++++++++++++++-
1 files changed, 15 insertions(+), 1 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 447ba36..27bdde4 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
@@ -4,12 +4,14 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.databind.annotation.JsonSerialize;
+import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
-import org.apache.xalan.templates.VarNameCollector;
import java.time.LocalDateTime;
+import java.util.List;
/**
* 系统用户
@@ -127,6 +129,7 @@
*/
@TableField("community_id")
@ApiModelProperty(value = "社区ID")
+ @JsonSerialize(using = ToStringSerializer.class)
private Long communityId;
/**
* 状态（1=正常，2=冻结，3=删除）
@@ -138,4 +141,15 @@
*/
@TableField("create_time")
private LocalDateTime createTime;
+
+ @TableField(exist = false)
+ @ApiModelProperty(value = "账号层级 2.0.1新增")
+ private List<SystemUserLevel> systemUserLevels;
+
+ @TableField(exist = false)
+ private Integer levelId;
+
+
+
+
}
--
Gitblit v1.7.1