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/TTestMethodConfirmSheet.java | 5 ++++- 1 files changed, 4 insertions(+), 1 deletions(-) diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTestMethodConfirmSheet.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTestMethodConfirmSheet.java index c8b586f..42bce1b 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TTestMethodConfirmSheet.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TTestMethodConfirmSheet.java @@ -1,6 +1,7 @@ package com.ruoyi.system.model; import com.baomidou.mybatisplus.annotation.*; +import com.fasterxml.jackson.annotation.JsonFormat; import com.ruoyi.common.core.domain.BaseModel; import io.swagger.annotations.ApiModel; import io.swagger.annotations.ApiModelProperty; @@ -38,6 +39,7 @@ private String confirmSign; @ApiModelProperty(value = "签字时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("sign_time") private LocalDateTime signTime; @@ -47,13 +49,14 @@ @ApiModelProperty(value = "审核人") @TableField("audit_person_id") - private String auditPersonId; + private Long auditPersonId; @ApiModelProperty(value = "审核签字") @TableField("audit_sign") private String auditSign; @ApiModelProperty(value = "审核时间") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8") @TableField("audit_time") private LocalDateTime auditTime; -- Gitblit v1.7.1