From 4f986140a10e71c07c7001ccbcda6e93e17736b1 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期二, 23 四月 2024 15:59:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 cnas-server/src/main/java/com/yuanchu/mom/pojo/Certification.java |    5 ++++-
 1 files changed, 4 insertions(+), 1 deletions(-)

diff --git a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Certification.java b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Certification.java
index cf9bedd..cad004f 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/pojo/Certification.java
+++ b/cnas-server/src/main/java/com/yuanchu/mom/pojo/Certification.java
@@ -32,18 +32,21 @@
 
     @ValueTableShow(5)
     @ApiModelProperty(value = "璧勮川璇存槑")
-    private String explain;
+    private String explanation;
 
     @ValueTableShow(6)
     @ApiModelProperty(value = "棣栨棰佸彂鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime firstTime;
 
     @ValueTableShow(7)
     @ApiModelProperty(value = "鏈�杩戦鍙戞椂闂�")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime recentlyTime;
 
     @ValueTableShow(8)
     @ApiModelProperty(value = "鍒版湡棰佸彂鏃堕棿")
+    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
     private LocalDateTime expireTime;
 
     @ApiModelProperty(value = "鍒涘缓浜�")

--
Gitblit v1.9.3