From a8f678206bc9032bad6920510094df817fcb6186 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期五, 23 五月 2025 17:45:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 ruoyi-system/src/main/java/com/ruoyi/system/model/TQaTestItemReport.java |    9 ++++++++-
 1 files changed, 8 insertions(+), 1 deletions(-)

diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/model/TQaTestItemReport.java b/ruoyi-system/src/main/java/com/ruoyi/system/model/TQaTestItemReport.java
index 2c9239a..3708ce1 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/model/TQaTestItemReport.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/model/TQaTestItemReport.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;
@@ -37,11 +38,16 @@
     @TableField("report_content")
     private String reportContent;
 
+    @ApiModelProperty(value = "报告编号")
+    @TableField("report_code")
+    private String reportCode;
+
     @ApiModelProperty(value = "制定人")
     @TableField("develop_person")
     private String developPerson;
 
     @ApiModelProperty(value = "制定日期")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
     @TableField("develop_date")
     private LocalDateTime developDate;
 
@@ -51,9 +57,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;
 

--
Gitblit v1.7.1