From 88055f5966507100a3b3d334ca1eb3cabc02ba14 Mon Sep 17 00:00:00 2001 From: zhangherong <571457620@qq.com> Date: 星期四, 17 七月 2025 20:19:08 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java index b5212d9..93562d0 100644 --- a/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java +++ b/lxzn-module-eam-common/src/main/java/org/jeecg/modules/eam/entity/EamThirdMaintenanceOrder.java @@ -138,7 +138,7 @@ */ @Excel(name = "妫�鏌ヤ汉", width = 15) @ApiModelProperty(value = "妫�鏌ヤ汉") - @Dict(dicCode = "sys_user, realname, username") + @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String inspector; /** * 妫�鏌ユ椂闂� @@ -153,7 +153,7 @@ */ @Excel(name = "鎿嶄綔浜虹瀛�", width = 15) @ApiModelProperty(value = "鎿嶄綔浜虹瀛�") - @Dict(dicCode = "sys_user, realname, username") + @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String operatorSignature; /** * 鍗忓姪鎿嶄綔浜� @@ -174,7 +174,7 @@ */ @Excel(name = "缁翠慨浜虹瀛�", width = 15) @ApiModelProperty(value = "缁翠慨浜虹瀛�") - @Dict(dicCode = "sys_user, realname, username") + @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String repairmanSignature; /** * 鍗忓姪缁翠慨浜� @@ -195,7 +195,7 @@ */ @Excel(name = "缁翠慨瀹や富浠荤瀛�", width = 15) @ApiModelProperty(value = "缁翠慨瀹や富浠荤瀛�") - @Dict(dicCode = "sys_user, realname, username") + @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String repairManagerSignature; /** * 缁翠慨瀹や富浠荤瀛楁椂闂� @@ -210,7 +210,7 @@ */ @Excel(name = "璁惧妫�鏌ヤ汉绛惧瓧", width = 15) @ApiModelProperty(value = "璁惧妫�鏌ヤ汉绛惧瓧") - @Dict(dicCode = "sys_user, realname, username") + @Dict(dictTable = "sys_user", dicCode = "username", dicText = "realname") private String inspectorSignature; /** * 璁惧妫�鏌ヤ汉绛惧瓧鏃堕棿 -- Gitblit v1.9.3