From 4d7c08f5d3ff26b4c47761a27d9ba81f50e517dd Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期二, 15 四月 2025 16:30:31 +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