From 0b4f853f6b05b28e3201386bdda3e8af0bfcfc7f Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 20 五月 2025 09:28:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TTesterOtherTask.java | 13 +++++++++++--
1 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTesterOtherTask.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTesterOtherTask.java
index f8845a7..1d17eea 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTesterOtherTask.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTesterOtherTask.java
@@ -1,13 +1,16 @@
package com.ruoyi.system.model;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.IdType;
+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 com.ruoyi.common.core.domain.BaseModel;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
import lombok.EqualsAndHashCode;
-import java.io.Serializable;
import java.time.LocalDateTime;
/**
@@ -33,11 +36,16 @@
@TableField("team_id")
private String teamId;
+ @ApiModelProperty(value = "实验员id")
+ @TableField("tester_id")
+ private Long testerId;
+
@ApiModelProperty(value = "任务内容")
@TableField("task_content")
private String taskContent;
@ApiModelProperty(value = "任务时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("task_time")
private LocalDateTime taskTime;
@@ -46,6 +54,7 @@
private Double evaluateScore;
@ApiModelProperty(value = "评定时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("evaluate_time")
private LocalDateTime evaluateTime;
--
Gitblit v1.7.1