From 4864c87d65e797d2ecd827b1eca9d46aec0950aa Mon Sep 17 00:00:00 2001
From: lyh <925863403@qq.com>
Date: 星期三, 25 六月 2025 11:56:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
lxzn-module-mdc/src/main/java/org/jeecg/modules/mdc/entity/MdcDowntime.java | 14 +++++++++++++-
1 files changed, 13 insertions(+), 1 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 e08812a..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
@@ -62,7 +62,6 @@
*/
@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