From 7289189c907038db99d41aefcd9e12dce5077d3e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 19 五月 2025 10:17:26 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TProjectTeamStaff.java | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TProjectTeamStaff.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TProjectTeamStaff.java
index 35ee78b..3824475 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TProjectTeamStaff.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TProjectTeamStaff.java
@@ -36,11 +36,16 @@
@ApiModelProperty(value = "用户id")
@TableField("user_id")
- private Integer userId;
+ private Long userId;
@ApiModelProperty(value = "角色类型 2=审批人 3=工艺工程师 4=实验员 5=化验师")
@TableField("role_type")
private Integer roleType;
-
+ @ApiModelProperty(value = "用户名")
+ @TableField(exist = false)
+ private String nickName;
+ @ApiModelProperty(value = "头像")
+ @TableField(exist = false)
+ private String avatar;
}
--
Gitblit v1.7.1