From 1007e0b552accd3288e7da6b47d8cc49a03bdf62 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期日, 27 四月 2025 11:06:35 +0800 Subject: [PATCH] art: 从沃克项目迁移设备管理代码到航宇 --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 deletions(-) diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java similarity index 94% rename from lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java rename to lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java index 6c4d814..260f414 100644 --- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java +++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamWeekMaintenanceOrder.java @@ -96,6 +96,10 @@ @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 = "纭绫诲瀷") + @Dict(dicCode = "approved_rejected") + private String confirmDealType; /**淇濆吇鎵ц鍥剧墖;id浠ラ�楀彿鍒嗛殧*/ @ApiModelProperty(value = "淇濆吇鎵ц鍥剧墖;id浠ラ�楀彿鍒嗛殧") private String imageFiles; @@ -107,6 +111,7 @@ private String confirmComment; /**鍒濋獙鏀朵汉*/ @ApiModelProperty(value = "鍒濋獙鏀朵汉") + @Dict(dicCode = "sys_user, realname, username") private String initialAcceptanceUser; /**鍒濋獙鏀舵椂闂�*/ @ApiModelProperty(value = "鍒濋獙鏀舵椂闂�") @@ -121,6 +126,7 @@ private String initialAcceptanceFiles; /**缁堥獙鏀朵汉*/ @ApiModelProperty(value = "缁堥獙鏀朵汉") + @Dict(dicCode = "sys_user, realname, username") private String finalAcceptanceUser; /**缁堥獙鏀舵椂闂�*/ @ApiModelProperty(value = "缁堥獙鏀舵椂闂�") -- Gitblit v1.9.3