From cfdaaae8690e188f6971057259873aa408ebc9e3 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 25 四月 2024 16:49:56 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/Certification.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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..a7074ae 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,20 @@
@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 = "鍒涘缓浜�")
@@ -51,20 +53,19 @@
private Integer createUser;
@ValueTableShow(9)
- @ApiModelProperty(value = "鍒涘缓浜�")
+ @ApiModelProperty(value = "鏇存柊浜�")
private String createUserName;
@ApiModelProperty(value = "淇敼浜篿d")
@TableField(fill = FieldFill.INSERT_UPDATE)
private Integer updateUser;
- @ValueTableShow(10)
- @ApiModelProperty(value = "鍒涘缓鏃堕棿")
+ @ValueTableShow(7)
+ @ApiModelProperty(value = "鏈�杩戦鍙戞椂闂�")
@TableField(fill = FieldFill.INSERT)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime createTime;
- @ApiModelProperty(value = "鏇存柊鏃堕棿")
@TableField(fill = FieldFill.INSERT_UPDATE)
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime updateTime;
--
Gitblit v1.9.3