From 2f432628a460a73f830c278a7d69e8328767a7b6 Mon Sep 17 00:00:00 2001
From: feige <791364011@qq.com>
Date: 星期一, 10 六月 2024 10:12:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
zhang-content/src/main/java/com/ruoyi/domain/ZAbroad.java | 9 ++++++++-
1 files changed, 8 insertions(+), 1 deletions(-)
diff --git a/zhang-content/src/main/java/com/ruoyi/domain/ZAbroad.java b/zhang-content/src/main/java/com/ruoyi/domain/ZAbroad.java
index 2f908e6..10c8719 100644
--- a/zhang-content/src/main/java/com/ruoyi/domain/ZAbroad.java
+++ b/zhang-content/src/main/java/com/ruoyi/domain/ZAbroad.java
@@ -52,7 +52,14 @@
*/
@JsonFormat(pattern = "yyyy-MM-dd")
@Excel(name="璧峰鏃ユ湡",dateFormat = "yyyy-MM-dd")
- private Date startDate;
+ private Date startTime;
+
+ /**
+ * 缁撴潫鏃ユ湡
+ */
+ @JsonFormat(pattern = "yyyy-MM-dd")
+ @Excel(name="缁撴潫鏃ユ湡",dateFormat = "yyyy-MM-dd")
+ private Date endTime;
}
--
Gitblit v1.9.1