From 8267cbdb4dc96787e245a794f7ec6b4cadf7d532 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期四, 23 五月 2024 16:47:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/pojo/Certification.java | 26 +++++++++++---------------
1 files changed, 11 insertions(+), 15 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 cad004f..91a0ddf 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
@@ -37,44 +37,40 @@
@ValueTableShow(6)
@ApiModelProperty(value = "棣栨棰佸彂鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime firstTime;
-
+ private LocalDateTime firstIssuanceDate;
@ValueTableShow(7)
@ApiModelProperty(value = "鏈�杩戦鍙戞椂闂�")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
- private LocalDateTime recentlyTime;
+ private LocalDateTime latestIssuanceDate;
+
+
@ValueTableShow(8)
@ApiModelProperty(value = "鍒版湡棰佸彂鏃堕棿")
@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
private LocalDateTime expireTime;
+
+ @ApiModelProperty(value = "棰佸竷鏃ユ湡")
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private LocalDateTime dateOfIssuance;
+
@ApiModelProperty(value = "鍒涘缓浜�")
@TableField(fill = FieldFill.INSERT)
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 = "鍒涘缓鏃堕棿")
- @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;
-
- @ValueTableShow(11)
- @ApiModelProperty(value = "鐘舵��")
- private Integer state;
@ApiModelProperty(value = "璧勮川鍥剧墖鍦板潃")
private String imageUrl;
--
Gitblit v1.9.3