From fada4b3ee4fbae5f82dba72fe8ad175a724d9cf7 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Mon, 19 Feb 2024 15:18:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeEntity.java | 7 +++----
1 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeEntity.java b/src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeEntity.java
index 639618d..2c53fd4 100644
--- a/src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeEntity.java
+++ b/src/main/java/org/springblade/modules/ownersCommittee/entity/OwnersCommitteeEntity.java
@@ -58,7 +58,7 @@
/** 建立时间 */
@ApiModelProperty(value = "建立时间", example = "")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("establish_time")
private Date establishTime;
@@ -119,13 +119,13 @@
/** 开始时间 */
@ApiModelProperty(value = "开始时间", example = "")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("start_time")
private Date startTime;
/** 截止时间 */
@ApiModelProperty(value = "截止时间", example = "")
- @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss", timezone = "GMT+8")
+ @JsonFormat(pattern = "yyyy-MM-dd", timezone = "GMT+8")
@TableField("end_time")
private Date endTime;
@@ -169,6 +169,5 @@
/** 0否 1是 */
@ApiModelProperty(value = "0否 1是", example = "")
@TableField("delete_flag")
- @TableLogic
private Integer deleteFlag;
}
--
Gitblit v1.9.3