From 02dbaaa04bc443e860a715cf907bc0fb5c1a7da4 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期二, 11 七月 2023 09:09:34 +0800
Subject: [PATCH] Merge branch 'master' of http://dev.vci-tech.com:1065/r/ubcs

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/controller/BtmTypeController.java |    5 ++---
 1 files changed, 2 insertions(+), 3 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 4613774..47f812c 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
@@ -11,7 +11,7 @@
 import com.vci.ubcs.omd.entity.BtmType;
 import com.vci.ubcs.omd.repeater.DomainRepeater;
 import com.vci.ubcs.omd.service.IBtmTypeService;
-import com.vci.ubcs.omd.vo.BtmTypeTreeVO;
+import com.vci.ubcs.omd.vo.BtmTreeVO;
 import com.vci.ubcs.omd.vo.BtmTypeVO;
 import com.vci.ubcs.omd.vo.DomainVO;
 import com.vci.ubcs.omd.wrapper.BtmTypeWrapper;
@@ -50,7 +50,6 @@
 	 * 涓氬姟绫诲瀷鏈嶅姟
 	 */
 	private final IBtmTypeService btmTypeService;
-
 
 	/**
 	 * 鏌ョ湅璇︽儏
@@ -161,7 +160,7 @@
 	@GetMapping("/tree-domain")
 	@ApiOperationSupport(order = 7)
 	@ApiOperation(value = "涓氬姟绫诲瀷鏍戝舰缁撴瀯", notes = "涓氬姟绫诲瀷鏍戝舰缁撴瀯")
-	public R<List<BtmTypeTreeVO>> treeDomain(){
+	public R<List<BtmTreeVO>> treeDomain(){
 		return R.data(btmTypeService.treeDomain());
 	}
 

--
Gitblit v1.9.3