From d702f4216de3fbf89b8829d7e5289f0ae761ee0d Mon Sep 17 00:00:00 2001
From: luxiaotao1123 <t1341870251@163.com>
Date: 星期二, 19 十二月 2023 16:30:52 +0800
Subject: [PATCH] #
---
zy-asrs-wms/src/main/resources/application.yml | 2 +-
zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Resource.java | 10 +---------
2 files changed, 2 insertions(+), 10 deletions(-)
diff --git a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Resource.java b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Resource.java
index 759338d..136004f 100644
--- a/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Resource.java
+++ b/zy-asrs-common/src/main/java/com/zy/asrs/common/sys/entity/Resource.java
@@ -3,9 +3,6 @@
import com.baomidou.mybatisplus.annotation.IdType;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
-import com.zy.asrs.common.sys.service.ResourceService;
-import com.zy.asrs.framework.common.Cools;
-import com.zy.asrs.framework.common.SpringUtils;
import lombok.Data;
import java.io.Serializable;
@@ -74,12 +71,7 @@
public String getResourceName(){
- ResourceService service = SpringUtils.getBean(ResourceService.class);
- Resource resource = service.getById(this.resourceId);
- if (!Cools.isEmpty(resource)){
- return resource.getName();
- }
- return null;
+ return this.name;
}
public String getLevel$(){
diff --git a/zy-asrs-wms/src/main/resources/application.yml b/zy-asrs-wms/src/main/resources/application.yml
index 39be3eb..63f74de 100644
--- a/zy-asrs-wms/src/main/resources/application.yml
+++ b/zy-asrs-wms/src/main/resources/application.yml
@@ -26,7 +26,7 @@
# global-config:
# field-strategy: 0
configuration:
- log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
+# log-impl: org.apache.ibatis.logging.stdout.StdOutImpl
map-underscore-to-camel-case: true
cache-enabled: true
global-config:
--
Gitblit v1.9.1