From ce0651907f18a57dae80065e01589e975530f53e Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 20 五月 2025 18:52:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentDispatch.java | 21 +++++++++++++++++++--
1 files changed, 19 insertions(+), 2 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentDispatch.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentDispatch.java
index 79edaf4..726accf 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentDispatch.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TExperimentDispatch.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;
/**
@@ -34,6 +37,7 @@
private String proposalId;
@ApiModelProperty(value = "实验日期")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("experiment_date")
private LocalDateTime experimentDate;
@@ -46,10 +50,12 @@
private String experimentCode;
@ApiModelProperty(value = "实验开始时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("experiment_start_time")
private LocalDateTime experimentStartTime;
@ApiModelProperty(value = "实验结束时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("experiment_end_time")
private LocalDateTime experimentEndTime;
@@ -61,4 +67,15 @@
@TableField("status")
private Integer status;
+ @ApiModelProperty(value = "课题方案名称")
+ @TableField(exist = false)
+ private String projectName;
+ @ApiModelProperty(value = "课题方案编号")
+ @TableField(exist = false)
+ private String projectCode;
+
+ @ApiModelProperty(value = "参与人员名称拼接")
+ @TableField(exist = false)
+ private String participantsName;
+
}
--
Gitblit v1.7.1