From f2aa8eeb03ce9ccec8889b1f0ee23c574e6a20f8 Mon Sep 17 00:00:00 2001 From: caihaohan Date: Thu, 25 Jan 2024 11:09:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=2081275=20=E4=BC=81=E6=A0=87=E8=AE=A1?= =?UTF-8?q?=E5=88=92=E7=AB=8B=E9=A1=B9--=E9=9B=B6=E9=83=A8=E4=BB=B6?= =?UTF-8?q?=E5=90=8D=E7=A7=B0=E6=B2=A1=E6=9C=89=E5=9B=9E=E6=98=BE=E5=87=BA?= =?UTF-8?q?=E6=9D=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../process/esAnnualInit/entity/ProcessEsAnnualInit.java | 2 +- .../activiti/process/esChange/entity/ProcessEsChange.java | 2 +- .../process/esInitChange/entity/ProcessEsInitChange.java | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java index 9c76bcde..f7cfac9b 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esAnnualInit/entity/ProcessEsAnnualInit.java @@ -247,7 +247,7 @@ public class ProcessEsAnnualInit implements Serializable { * 零部件名称 */ @Excel(name = "*零部件名称", width = 15, orderNum = "13") - @Dict(dicCode = "part_name") + @Dict(dictTable = "laws_part_name", dicCode = "code", dicText = "name") @ApiModelProperty(value = "零部件名称") private String componentName; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java index 1c387b4d..312f81a1 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esChange/entity/ProcessEsChange.java @@ -148,7 +148,7 @@ public class ProcessEsChange implements Serializable { /** * 零部件名称 */ - @Dict(dicCode = "part_name") + @Dict(dictTable = "laws_part_name", dicCode = "code", dicText = "name") @ApiModelProperty(value = "零部件名称") private String partName; diff --git a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java index de8fe6d8..90667ba2 100644 --- a/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java +++ b/laws-modules/src/main/java/com/jero/modules/activiti/process/esInitChange/entity/ProcessEsInitChange.java @@ -281,7 +281,7 @@ public class ProcessEsInitChange implements Serializable { /** * 零部件名称 */ - @Dict(dicCode = "part_name") + @Dict(dictTable = "laws_part_name", dicCode = "code", dicText = "name") @ApiModelProperty(value = "零部件名称") private String componentName;