From 233c7122b0fe27b0edc6e987225c1ccf236c5ca9 Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期五, 01 九月 2023 14:39:00 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java | 19 ++++++-------------
1 files changed, 6 insertions(+), 13 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..cd049c0 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
@@ -2,7 +2,6 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.fasterxml.jackson.annotation.JsonFormat;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -10,10 +9,8 @@
import lombok.experimental.Accessors;
import org.jeecg.common.system.base.entity.JeecgEntity;
import org.jeecgframework.poi.excel.annotation.Excel;
-import org.springframework.format.annotation.DateTimeFormat;
import java.io.Serializable;
-import java.util.Date;
import java.util.List;
/**
@@ -40,19 +37,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 +70,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