From a1188a66f0549522068adde2fee430015077410c Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期三, 11 十月 2023 15:48:14 +0800
Subject: [PATCH] 接口整理
---
server/services/src/main/java/com/doumee/dao/business/model/Holidays.java | 9 ++-------
1 files changed, 2 insertions(+), 7 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 cfc85f2..65e411f 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
@@ -19,14 +19,12 @@
@ApiModel("鑺傚亣鏃ラ厤缃〃")
@TableName("\"holidays\"")
public class Holidays {
-
@ApiModelProperty(value = "缂栫爜")
@ExcelColumn(name="缂栫爜")
private String id;
@ApiModelProperty(value = "鍒涘缓鏃堕棿")
@ExcelColumn(name="鍒涘缓鏃堕棿")
- //@JsonFormat(pattern = "yyyy-MM-dd")
private Date createDate;
@ApiModelProperty(value = "鍒涘缓浜�")
@@ -35,7 +33,6 @@
@ApiModelProperty(value = "缂栬緫鏃堕棿")
@ExcelColumn(name="缂栬緫鏃堕棿")
- //@JsonFormat(pattern = "yyyy-MM-dd")
private Date editDate;
@ApiModelProperty(value = "缂栬緫浜�")
@@ -50,9 +47,7 @@
@ExcelColumn(name="澶囨敞")
private String info;
- @ApiModelProperty(value = "鏃ユ湡")
+ @ApiModelProperty(value = "鏃ユ湡,鏍煎紡yyyy-MM-DD")
@ExcelColumn(name="鏃ユ湡")
- //@JsonFormat(pattern = "yyyy-MM-dd")
- private Date holiday;
-
+ private String holiday;
}
--
Gitblit v1.9.3