From acb7c4c272aa02c2ed24cde72db429defef9fb8f Mon Sep 17 00:00:00 2001
From: wangting <675591594@qq.com>
Date: 星期四, 27 七月 2023 13:54:02 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferBtmTypeController.java |    4 +---
 1 files changed, 1 insertions(+), 3 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferBtmTypeController.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferBtmTypeController.java
index 4b64165..26821ce 100644
--- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferBtmTypeController.java
+++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/CodeReferBtmTypeController.java
@@ -50,11 +50,9 @@
 	@GetMapping(value = "/gridAttributesByBtmId")
 	@ApiOperationSupport(order = 1)
 	@ApiOperation(value = "鑾峰彇涓氬姟绫诲瀷鍖呭惈鐨勫睘鎬э紝涓嶅垎椤�", notes = "baseQueryObject")
-	public R<Page<AttributeVO>> gridAttributesByBtmId(BaseQueryObject baseQueryObject){
+	public R<Page<BtmTypeAttributeVO>> gridAttributesByBtmId(BaseQueryObject baseQueryObject){
 		return R.data(codeReferBtmTypeService.gridAttributesByBtmId(baseQueryObject));
 	}
-
-
 
 
 

--
Gitblit v1.9.3