From 2e3adf807c3c198746d3d51fbab4d71bdf22af81 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 10 十一月 2023 10:14:20 +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/core/annotation/excel/ExcelColumn.java | 7 ++++---
1 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/server/services/src/main/java/com/doumee/core/annotation/excel/ExcelColumn.java b/server/services/src/main/java/com/doumee/core/annotation/excel/ExcelColumn.java
index b649597..b7c7ef8 100644
--- a/server/services/src/main/java/com/doumee/core/annotation/excel/ExcelColumn.java
+++ b/server/services/src/main/java/com/doumee/core/annotation/excel/ExcelColumn.java
@@ -8,7 +8,7 @@
/**
* 鏍囪涓篍xcel鍒�
* @author Eva.Caesar Liu
- * @date 2022/03/15 09:54
+ * @date 2022/04/18 18:12
*/
@Inherited
@Target(ElementType.FIELD)
@@ -19,6 +19,7 @@
* 鍒楀悕
*/
String name();
+
/**
* 鍒楀锛堝崟浣嶄负瀛楃锛夛紝-1鑷姩璁＄畻
@@ -33,7 +34,7 @@
/**
* 瀵归綈鏂瑰紡
*/
- HorizontalAlignment align() default HorizontalAlignment.LEFT;
+ HorizontalAlignment align() default HorizontalAlignment.LEFT;
/**
* 鍒楄儗鏅壊
@@ -83,7 +84,7 @@
/**
* 鏃ユ湡鏍煎紡
*/
- String dateFormat() default "yyyy-MM-dd HH:mm:ss";
+ String dateFormat() default "yyyy-MM-dd";
/**
* 鑷畾涔夋暟鎹鐞嗗櫒
--
Gitblit v1.9.3