From 038f3e14174a00a111d489d5cf1b724275fe33da Mon Sep 17 00:00:00 2001
From: linwe <872216996@qq.com>
Date: Tue, 28 Nov 2023 18:10:37 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 src/main/java/org/springblade/modules/article/entity/Article.java |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/org/springblade/modules/article/entity/Article.java b/src/main/java/org/springblade/modules/article/entity/Article.java
index 09f2b8d..4bf1603 100644
--- a/src/main/java/org/springblade/modules/article/entity/Article.java
+++ b/src/main/java/org/springblade/modules/article/entity/Article.java
@@ -29,13 +29,13 @@
 	/**
 	 * 标题
 	 */
-	@NotNull(message = "标题不能为空")
+//	@NotNull(message = "标题不能为空")
 	private String title;
 
 	/**
 	 * 类型
 	 */
-	@NotNull(message = "类型")
+//	@NotNull(message = "类型")
 	private Integer type;
 
 	/**
@@ -105,7 +105,7 @@
 	 * 创建时间
 	 */
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
-	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+	@JsonFormat(pattern = "yyyy-MM-dd")
 	@ApiModelProperty("创建时间")
 	private Date createTime;
 

--
Gitblit v1.9.3