From 27ebd1feefb9890e9f5e3a0458f414d92354100b Mon Sep 17 00:00:00 2001 From: lihongjie0209 Date: Sun, 17 Dec 2023 10:56:19 +0800 Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E7=85=A4=E6=BA=90=E9=80=89?= =?UTF-8?q?=E6=8B=A9=E4=B8=8B=E6=8B=89=E6=A1=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/main/resources/scripts/dict/enum/coalInfoDict.groovy | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/resources/scripts/dict/enum/coalInfoDict.groovy b/src/main/resources/scripts/dict/enum/coalInfoDict.groovy index e6059870..4f4e0d22 100644 --- a/src/main/resources/scripts/dict/enum/coalInfoDict.groovy +++ b/src/main/resources/scripts/dict/enum/coalInfoDict.groovy @@ -5,7 +5,7 @@ import cn.lihongjie.coal.coalInfo.controller.CoalInfoController import cn.lihongjie.coal.coalInfo.entity.CoalInfoEntity import org.springframework.context.ApplicationContext -ApplicationContext ioc = ioc; +ApplicationContext ioc = ioc def controller = ioc.getBean(CoalInfoController.class) @@ -16,7 +16,7 @@ return controller.list(new CommonQuery()).content.collect { def entity = new CoalInfoEntity() entity.id = it.id entity.code = it.code - entity.name = it.supplierName + "-" + it.name - return entity; + entity.name = "$it.supplierName-$it.name($it.coalTypeName}" + return entity }