From 65df69ac23c18e05e75912484089529305c0e1dd Mon Sep 17 00:00:00 2001 From: yuxc <653031404@qq.com> Date: 星期二, 16 五月 2023 18:19:50 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java index 87a2030..4613774 100644 --- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java +++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java @@ -13,6 +13,7 @@ import com.vci.ubcs.omd.service.IBtmTypeService; import com.vci.ubcs.omd.vo.BtmTypeTreeVO; import com.vci.ubcs.omd.vo.BtmTypeVO; +import com.vci.ubcs.omd.vo.DomainVO; import com.vci.ubcs.omd.wrapper.BtmTypeWrapper; import io.swagger.annotations.*; import lombok.AllArgsConstructor; @@ -146,7 +147,7 @@ @GetMapping("/domain") @ApiOperationSupport(order = 6) @ApiOperation(value = "鑾峰彇棰嗗煙鍊�") - public R<List<String>> getDomain(){ + public R<List<DomainVO>> getDomain(){ try { return R.data(DomainRepeater.getDomain()); } catch (NacosException e) { -- Gitblit v1.9.3