From 02bb94e413f6950b9786c5ee86c0937bc20f8ae8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期六, 12 七月 2025 14:42:20 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/vo/system/SysUserVO.java | 13 +++++++++----
1 files changed, 9 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/SysUserVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/SysUserVO.java
index b699db5..916612d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/SysUserVO.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/system/SysUserVO.java
@@ -15,9 +15,14 @@
private Integer companyType;
@ApiModelProperty(value = "单位名称")
private String companyName;
- @ApiModelProperty(value = "部门")
- private List<String> deptList;
- @ApiModelProperty(value = "角色")
- private String roleName;
+ @ApiModelProperty(value = "所属项目/部门")
+ private String deptName;
+
+ @ApiModelProperty(value = "引用模板")
+ private String templateName;
+ @ApiModelProperty(value = "请假状态")
+ private String leaveName;
+ @ApiModelProperty(value = "请假时间")
+ private String leaveTime;
}
--
Gitblit v1.7.1