From 2dc478231fd09a88a4d86d44388ae807aca08bc5 Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期三, 01 一月 2025 10:14:28 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 medicalWaste-system/src/main/java/com/sinata/system/domain/vo/SysUserVO.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/SysUserVO.java b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/SysUserVO.java
index f86dbb7..3a46400 100644
--- a/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/SysUserVO.java
+++ b/medicalWaste-system/src/main/java/com/sinata/system/domain/vo/SysUserVO.java
@@ -14,7 +14,7 @@
     @ApiModelProperty("用户id")
     private Long userId;
 
-    @ApiModelProperty("用户名")
+    @ApiModelProperty("姓名")
     private String nickName;
 
     @ApiModelProperty("用户名")
@@ -26,12 +26,18 @@
     @ApiModelProperty("账号状态 0:正常 1:停用")
     private String status;
 
-    @ApiModelProperty(value = "机构id")
+    @ApiModelProperty(value = "区域/单位id")
     private Long departmentId;
+
+    @ApiModelProperty(value = "单位名称")
+    private String departmentName;
 
     @ApiModelProperty(value = "登录密码")
     private String password;
 
     @ApiModelProperty("角色id")
     private Long roleId;
+
+    @ApiModelProperty("层级关系")
+    private String relation;
 }

--
Gitblit v1.7.1