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/TQaProduceReport.java | 18 ++++++++++++++----
1 files changed, 14 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TQaProduceReport.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TQaProduceReport.java
index f616df4..9d37d1d 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TQaProduceReport.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TQaProduceReport.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,6 +36,10 @@
@TableField("team_id")
private String teamId;
+ @ApiModelProperty(value = "提交用户id、化验师")
+ @TableField("commit_person_id")
+ private Long commitPersonId;
+
@ApiModelProperty(value = "报告标题")
@TableField("report_title")
private String reportTitle;
@@ -46,6 +53,7 @@
private String developPerson;
@ApiModelProperty(value = "制定日期")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("develop_date")
private LocalDateTime developDate;
@@ -59,9 +67,10 @@
@ApiModelProperty(value = "审批人")
@TableField("audit_person_id")
- private Integer auditPersonId;
+ private Long auditPersonId;
@ApiModelProperty(value = "审批时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("audit_time")
private LocalDateTime auditTime;
@@ -75,9 +84,10 @@
@ApiModelProperty(value = "评定人")
@TableField("evaluate_person_id")
- private Integer evaluatePersonId;
+ private Long evaluatePersonId;
@ApiModelProperty(value = "评定时间")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
@TableField("evaluate_time")
private LocalDateTime evaluateTime;
--
Gitblit v1.7.1