From a8f678206bc9032bad6920510094df817fcb6186 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 23 五月 2025 17:45:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentDispatchParticipants.java | 12 ++++++++++--
1 files changed, 10 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentDispatchParticipants.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentDispatchParticipants.java
index e305ed6..b786f4d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentDispatchParticipants.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentDispatchParticipants.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -37,9 +38,9 @@
@ApiModelProperty(value = "用户id")
@TableField("user_id")
- private Integer userId;
+ private Long userId;
- @ApiModelProperty(value = "角色类型 3=工艺工程师 4=实验员 5=化验师")
+ @ApiModelProperty(value = "角色类型 3=工艺工程师 4=化验师 5=实验员")
@TableField("role_type")
private Integer roleType;
@@ -52,8 +53,15 @@
private String confirmSign;
@ApiModelProperty(value = "签字时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("sign_time")
private LocalDateTime signTime;
+ @ApiModelProperty(value = "用户姓名")
+ @TableField(exist = false)
+ private String nickName;
+ @ApiModelProperty(value = "用户头像")
+ @TableField(exist = false)
+ private String avatar;
}
--
Gitblit v1.7.1