From 3320df960ae37b4f6611baf6a6954e20b3b88fee Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期四, 13 三月 2025 15:29:50 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java
index 88eebae..e08812a 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java
@@ -48,7 +48,7 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "寮�濮嬫椂闂�")
- private Date startTime;
+ private Date startDate;
/**
* 缁撴潫鏃堕棿
*/
@@ -56,7 +56,7 @@
@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
@ApiModelProperty(value = "缁撴潫鏃堕棿")
- private Date endTime;
+ private Date endDate;
/**
* 鍋滄満鍘熷洜id
*/
--
Gitblit v1.9.3