From 4f1a71f740a5859fb2dfe6a5640e86f05c2a15ee Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Wed, 11 Oct 2023 17:20:53 +0800
Subject: [PATCH 1/2] =?UTF-8?q?tree-list=E6=8E=A5=E5=8F=A3=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E8=BF=94=E5=9B=9E=E5=80=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/xboe/module/type/api/TypeApi.java       | 4 ++++
 .../src/main/java/com/xboe/module/type/vo/TypeVo.java         | 3 +++
 2 files changed, 7 insertions(+)

diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/type/api/TypeApi.java b/servers/boe-server-all/src/main/java/com/xboe/module/type/api/TypeApi.java
index 397794d9..e137ab13 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/type/api/TypeApi.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/type/api/TypeApi.java
@@ -68,6 +68,8 @@ public class TypeApi extends ApiBaseController {
             if (StringUtil.equals(item.getParentId(), BaseConstant.TREEDATA_ROOT_PARENT_ID)) {
                 TypeVo vo = new TypeVo();
                 BeanUtils.copyProperties(item, vo);
+                vo.setCode(item.getId());
+                vo.setValue(item.getId());
                 ResDataManager rdm = resDataManagerMap.get(vo.getId());
                 if (rdm != null) {
                     User user = userService.get(rdm.getAid());
@@ -98,6 +100,8 @@ public class TypeApi extends ApiBaseController {
                 TypeVo vo = new TypeVo();
                 BeanUtils.copyProperties(item, vo);
                 vo.setParentName(typeVo.getName());
+                vo.setCode(item.getId());
+                vo.setValue(item.getId());
                 ResDataManager rdm = resDataManagerMap.get(vo.getId());
                 if (rdm != null) {
                     User user = userService.get(rdm.getAid());
diff --git a/servers/boe-server-all/src/main/java/com/xboe/module/type/vo/TypeVo.java b/servers/boe-server-all/src/main/java/com/xboe/module/type/vo/TypeVo.java
index 8da8beca..fbcfa757 100644
--- a/servers/boe-server-all/src/main/java/com/xboe/module/type/vo/TypeVo.java
+++ b/servers/boe-server-all/src/main/java/com/xboe/module/type/vo/TypeVo.java
@@ -31,4 +31,7 @@ public class TypeVo extends Type {
      * 资源数据管理人员
      */
     private ResDataManager resDataManager;
+
+    private String code;
+    private String value;
 }

From b5f4ee43f8ac311e464f545b017f163821a72175 Mon Sep 17 00:00:00 2001
From: 670788339 <670788339@qq.com>
Date: Wed, 11 Oct 2023 17:27:53 +0800
Subject: [PATCH 2/2] =?UTF-8?q?=E9=BB=98=E8=AE=A4=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6dev?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../boe-server-all/src/main/resources/application.properties  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/servers/boe-server-all/src/main/resources/application.properties b/servers/boe-server-all/src/main/resources/application.properties
index d591c3cb..7dccb218 100644
--- a/servers/boe-server-all/src/main/resources/application.properties
+++ b/servers/boe-server-all/src/main/resources/application.properties
@@ -1,5 +1,5 @@
-spring.profiles.active= test
-#@profileActive@
+spring.profiles.active= @profileActive@
+
 spring.application.name=boe-server-all
 server.port=9090
 server.servlet.session.timeout=30m