From 1e676b408c8c7e1ccca08b151619d89fdc2bc9bf Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期二, 10 十月 2023 14:40:31 +0800
Subject: [PATCH] Merge branch 'dev' of http://139.186.142.91:10010/r/productDev/parkBike into dev
---
server/services/src/main/java/com/doumee/dao/business/model/Holidays.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/dao/business/model/Holidays.java b/server/services/src/main/java/com/doumee/dao/business/model/Holidays.java
index 1513c92..cfc85f2 100644
--- a/server/services/src/main/java/com/doumee/dao/business/model/Holidays.java
+++ b/server/services/src/main/java/com/doumee/dao/business/model/Holidays.java
@@ -26,7 +26,7 @@
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -35,7 +35,7 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
@@ -52,7 +52,7 @@
@ApiModelProperty(value = "鏃ユ湡")
@ExcelColumn(name="鏃ユ湡")
- @JsonFormat(pattern = "yyyy-MM-dd")
+ //@JsonFormat(pattern = "yyyy-MM-dd")
private Date holiday;
}
--
Gitblit v1.9.3