From 0c989fbcca1cd4b53d59e8ba288227a5a68d92a4 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 27 六月 2025 18:08:25 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/laboratory
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TProjectTeamStaff.java | 11 ++++++++---
1 files changed, 8 insertions(+), 3 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..94972cb 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=化验师")
+ @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