From 9c20f268e0628017d09427989724cdf2a8e9e8e2 Mon Sep 17 00:00:00 2001
From: jiaosong <jiaosong6760@dingtalk.com>
Date: 星期二, 19 九月 2023 12:47:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java | 2 --
1 files changed, 0 insertions(+), 2 deletions(-)
diff --git a/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java b/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java
index 93ee05f..13377aa 100644
--- a/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java
+++ b/server/service/src/main/java/com/doumee/dao/business/model/BaseCategory.java
@@ -35,7 +35,6 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鏇存柊浜虹紪鐮�", example = "1")
@@ -44,7 +43,6 @@
@ApiModelProperty(value = "鏇存柊鏃堕棿")
@ExcelColumn(name="鏇存柊鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "鏄惁鍒犻櫎0鍚� 1鏄�", example = "1")
--
Gitblit v1.9.3