From 5c3a04ce3b4b7a127b1c73c1cfe058a76cc55ad2 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期五, 01 九月 2023 14:25:17 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java | 16 ++++++----------
1 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
index 9bd4ba0..31c096c 100644
--- a/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
+++ b/lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java
@@ -40,19 +40,15 @@
/**
* 鍔犵彮寮�濮嬫椂闂�
*/
- @Excel(name = "鍔犵彮寮�濮嬫椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍔犵彮寮�濮嬫椂闂�", width = 20)
@ApiModelProperty(value = "鍔犵彮寮�濮嬫椂闂�")
- private Date startTime;
+ private String startTime;
/**
* 鍔犵彮缁撴潫鏃堕棿
*/
- @Excel(name = "鍔犵彮缁撴潫鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
- @JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
- @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鍔犵彮缁撴潫鏃堕棿", width = 20)
@ApiModelProperty(value = "鍔犵彮缁撴潫鏃堕棿")
- private Date endTime;
+ private String endTime;
/**
* 澶囨敞
@@ -77,14 +73,14 @@
/**
* 鐝寮�濮嬫椂闂�
*/
- @Excel(name = "鐝寮�濮嬫椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鐝寮�濮嬫椂闂�", width = 20, format = "HH:mm:ss")
@ApiModelProperty("鐝寮�濮嬫椂闂�")
private String startDate;
/**
* 鐝缁撴潫鏃堕棿
*/
- @Excel(name = "鐝缁撴潫鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @Excel(name = "鐝缁撴潫鏃堕棿", width = 20, format = "HH:mm:ss")
@ApiModelProperty("鐝缁撴潫鏃堕棿")
private String endDate;
--
Gitblit v1.9.3