From f0afb2b17f2f6e13925ffe1b6fd8c8ae724aec0e Mon Sep 17 00:00:00 2001
From: chenrui <1187576398@qq.com>
Date: 星期四, 13 三月 2025 10:46:24 +0800
Subject: [PATCH] 分支合并冲突解决
---
cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewProgram.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewProgram.java b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewProgram.java
index d78f41b..c177e62 100644
--- a/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewProgram.java
+++ b/cnas-manage/src/main/java/com/ruoyi/manage/pojo/ManageReviewProgram.java
@@ -1,6 +1,7 @@
package com.ruoyi.manage.pojo;
import com.baomidou.mybatisplus.annotation.*;
+import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
@@ -29,6 +30,7 @@
private Integer id;
@ApiModelProperty("璇勫鏃堕棿")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime reviewTime;
@ApiModelProperty("璇勫鍦扮偣")
@@ -59,12 +61,14 @@
private String editor;
@ApiModelProperty("缂栧埗鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime editorDate;
@ApiModelProperty("鎵瑰噯")
private String approve;
@ApiModelProperty("鎵瑰噯鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime approveDate;
@TableField(fill = FieldFill.INSERT)
--
Gitblit v1.9.3