From e387a74a0b132d383775a743a18d794a34a422b3 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期二, 15 四月 2025 16:54:27 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
index 6c4d814..45001fb 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java
@@ -96,6 +96,9 @@
 	@JsonFormat(timezone = "GMT+8", pattern = "yyyy-MM-dd HH:mm:ss")
 	@DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
 	private Date confirmTime;
+	/** 纭绫诲瀷 1 閫氳繃  2 椹冲洖 */
+	@ApiModelProperty(value = "纭绫诲瀷")
+	private String confirmDealType;
 	/**淇濆吇鎵ц鍥剧墖;id浠ラ�楀彿鍒嗛殧*/
     @ApiModelProperty(value = "淇濆吇鎵ц鍥剧墖;id浠ラ�楀彿鍒嗛殧")
 	private String imageFiles;

--
Gitblit v1.9.3