From 2b287056e2f59518888d05a1bbc7e5a55fbd84d5 Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期三, 15 十月 2025 10:35:14 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/wuhuyancao' into wuhuyancao

---
 server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartmentUser.java |    4 ++--
 1 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartmentUser.java b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartmentUser.java
index 292901a..45df0c1 100644
--- a/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartmentUser.java
+++ b/server/system_service/src/main/java/com/doumee/dao/system/model/SystemDepartmentUser.java
@@ -2,10 +2,10 @@
 
 import com.baomidou.mybatisplus.annotation.IdType;
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.doumee.service.business.third.model.LoginUserModel;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
-import com.fasterxml.jackson.annotation.JsonFormat;
 
 import java.io.Serializable;
 import java.util.Date;
@@ -16,7 +16,7 @@
  */
 @Data
 @ApiModel("閮ㄩ棬鐢ㄦ埛")
-public class SystemDepartmentUser implements Serializable {
+public class SystemDepartmentUser extends LoginUserModel implements Serializable {
 
     @TableId(type = IdType.AUTO)
     @ApiModelProperty(value = "涓婚敭", example = "1")

--
Gitblit v1.9.3