From 609a1931953b2298016bd2b0d6b410666b5ad7b9 Mon Sep 17 00:00:00 2001
From: rk <94314517@qq.com>
Date: 星期四, 02 七月 2026 09:19:15 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/3.0.1' into 3.0.1
---
server/services/src/main/java/com/doumee/dao/business/web/response/UserResponse.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/web/response/UserResponse.java b/server/services/src/main/java/com/doumee/dao/business/web/response/UserResponse.java
index 55825c4..d587e57 100644
--- a/server/services/src/main/java/com/doumee/dao/business/web/response/UserResponse.java
+++ b/server/services/src/main/java/com/doumee/dao/business/web/response/UserResponse.java
@@ -1,5 +1,7 @@
package com.doumee.dao.business.web.response;
+import com.doumee.core.annotation.excel.ExcelColumn;
+import com.doumee.dao.system.model.SystemUser;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -15,7 +17,7 @@
public class UserResponse {
@ApiModelProperty(value = "鐢ㄦ埛涓婚敭")
- private Integer id;
+ private String id;
@ApiModelProperty(value = "濮撳悕")
private String name;
@@ -39,6 +41,7 @@
@ApiModelProperty(value = "鎬у埆")
private Integer sex;
-
+ @ApiModelProperty(value = "鍏宠仈绯荤粺绠＄悊鍛樿处鍙风紪鐮�")
+ private SystemUser sysuser;
}
--
Gitblit v1.9.3