From 9f1304e6fddd17f5fe5461ce677f3ec191331ccc Mon Sep 17 00:00:00 2001
From: lius <Lius2225@163.com>
Date: 星期五, 01 九月 2023 11:48:07 +0800
Subject: [PATCH] update
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcEquipmentOvertime.java | 60 ++++++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 44 insertions(+), 16 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 5876e4e..9bd4ba0 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
@@ -32,33 +32,61 @@
private static final long serialVersionUID = -7163039765166584824L;
/**
- * 璁惧缂栫爜
+ * 宸ヤ綔鏃ュ巻id
*/
- @Excel(name = "璁惧缂栫爜", width = 15)
- @ApiModelProperty(value = "璁惧缂栫爜")
+ @ApiModelProperty(value = "宸ヤ綔鏃ュ巻id")
+ private String calendarId;
+
+ /**
+ * 鍔犵彮寮�濮嬫椂闂�
+ */
+ @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")
+ @ApiModelProperty(value = "鍔犵彮寮�濮嬫椂闂�")
+ private Date 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")
+ @ApiModelProperty(value = "鍔犵彮缁撴潫鏃堕棿")
+ private Date endTime;
+
+ /**
+ * 澶囨敞
+ */
+ @Excel(name = "澶囨敞")
+ @ApiModelProperty(value = "澶囨敞")
+ private String remark;
+
+ @TableField(exist = false)
private String equipmentId;
+
+ @TableField(exist = false)
+ private String equipmentName;
+
/**
* 鐢熸晥鏃ユ湡
*/
@Excel(name = "鐢熸晥鏃ユ湡", width = 15)
- @ApiModelProperty(value = "鐢熸晥鏃ユ湡")
+ @TableField(exist = false)
private String effectiveDate;
+
/**
- * 寮�濮嬫椂闂�
+ * 鐝寮�濮嬫椂闂�
*/
- @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")
- @ApiModelProperty(value = "寮�濮嬫椂闂�")
- private Date startTime;
+ @Excel(name = "鐝寮�濮嬫椂闂�", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("鐝寮�濮嬫椂闂�")
+ private String startDate;
+
/**
- * 缁撴潫鏃堕棿
+ * 鐝缁撴潫鏃堕棿
*/
- @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")
- @ApiModelProperty(value = "缁撴潫鏃堕棿")
- private Date endTime;
+ @Excel(name = "鐝缁撴潫鏃堕棿", width = 20, format = "yyyy-MM-dd HH:mm:ss")
+ @ApiModelProperty("鐝缁撴潫鏃堕棿")
+ private String endDate;
/**
* 鍓嶅彴浼犲叆 鍒ゆ柇姣忎釜id
--
Gitblit v1.9.3