From bd953391a74b86db829df43992c7cf3c5207634b Mon Sep 17 00:00:00 2001 From: 无关风月 <443237572@qq.com> Date: 星期五, 27 六月 2025 18:07:22 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-system/src/main/java/com/ruoyi/system/vo/TTestMethodConfirmSheetVO.java | 18 ++++++++++++++++++ 1 files changed, 18 insertions(+), 0 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TTestMethodConfirmSheetVO.java b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TTestMethodConfirmSheetVO.java index 554dbe0..41ddc6d 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/vo/TTestMethodConfirmSheetVO.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/vo/TTestMethodConfirmSheetVO.java @@ -1,11 +1,13 @@ package com.ruoyi.system.vo; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.system.model.TTestMethodConfirmSheet; import com.ruoyi.system.model.TTestMethodConfirmSheetTerm; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; import lombok.Data; +import java.time.LocalDateTime; import java.util.List; @Data @@ -27,5 +29,21 @@ @ApiModelProperty(value = "审核人姓名") private String auditPersonName; + @ApiModelProperty(value = "通知时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime experimentDate; + + @ApiModelProperty(value = "实验开始时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime experimentStartTime; + + @ApiModelProperty(value = "实验结束时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") + private LocalDateTime experimentEndTime; + + @ApiModelProperty(value = "参与人员名称拼接") + private String participantsName; + @ApiModelProperty(value = "状态") + private Integer status; } -- Gitblit v1.7.1