From cd00884c3db8fa6808b3b5949ab1a2b1459d6bdc Mon Sep 17 00:00:00 2001
From: cuilei <ray_tsu1@163.com>
Date: 星期三, 11 六月 2025 10:36:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 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..b931cea 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,13 +56,12 @@
@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
*/
@Excel(name = "鍋滄満鍘熷洜id", width = 15)
@ApiModelProperty(value = "鍋滄満鍘熷洜id")
- @Dict(dictTable = "mdc_downtime_reason",dicCode = "id",dicText = "downtime_type")
private String reasonId;
/**
* 鐘舵�侊紙0鏈笂鎶ワ紝1宸蹭笂鎶ワ級
@@ -82,5 +81,18 @@
@Excel(name = "澶囨敞", width = 15)
@ApiModelProperty(value = "澶囨敞")
private String remark;
+ /**
+ * 褰曞叆绫诲瀷
+ */
+ @Excel(name = "褰曞叆绫诲瀷", width = 15)
+ @ApiModelProperty(value = "褰曞叆绫诲瀷")
+ @Dict(dicCode = "enter_type")
+ private Integer enterType;
+ /**
+ * 鍋滄満鏃堕暱
+ */
+ @Excel(name = "鍋滄満鏃堕暱", width = 15)
+ @ApiModelProperty(value = "鍋滄満鏃堕暱")
+ private Integer shutdownDuration;
}
--
Gitblit v1.9.3