From 70fb56a9fb61f70ccc55fcbc085b470e9423858a Mon Sep 17 00:00:00 2001 From: fujunling <2984387807@qq.com> Date: 星期一, 05 六月 2023 16:16:35 +0800 Subject: [PATCH] 解决冲突 --- Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java | 10 +++------- 1 files changed, 3 insertions(+), 7 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java index 92e34d4..04e09cc 100644 --- a/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java +++ b/Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/ICodeClassifyService.java @@ -5,16 +5,13 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.vci.ubcs.code.bo.CodeClassifyFullInfoBO; import com.vci.ubcs.code.entity.CodeClassify; -import com.vci.ubcs.code.vo.CodeOsattributeVO; import com.vci.ubcs.code.vo.pagemodel.CodeClassifyVO; +import com.vci.ubcs.omd.vo.BtmTypeAttributeVO; import com.vci.ubcs.starter.exception.VciBaseException; import com.vci.ubcs.starter.revision.model.TreeQueryObject; -import com.vci.ubcs.starter.util.BladeTreeQueryObject; import com.vci.ubcs.starter.web.pagemodel.BaseQueryObject; -import com.vci.ubcs.starter.web.pagemodel.DataGrid; -import com.vci.ubcs.starter.web.pagemodel.Tree; +import com.vci.ubcs.starter.web.pagemodel.DataGrid;import com.vci.ubcs.starter.web.pagemodel.Tree; import org.springblade.core.tool.api.R; - import java.io.File; import java.util.Collection; import java.util.List; @@ -170,7 +167,7 @@ * @param baseQueryObject 鏌ヨ瀵硅薄锛屽繀椤绘湁codeClassifyOid锛屾敮鎸乮d鍜宯ame涓ょ鏌ヨ鏉′欢 * @return 灞炴�х殑淇℃伅锛屽寘鍚粯璁ょ殑灞炴�� */ - DataGrid<CodeOsattributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject); + DataGrid<BtmTypeAttributeVO> listClassifyLinkAttr(BaseQueryObject baseQueryObject); /** * 鑾峰彇褰撳墠鍒嗙被鐨勯《灞傚垎绫� @@ -193,7 +190,6 @@ * @return 鍒嗙被鐨勬樉绀哄璞� */ CodeClassifyVO getObjectByIdPath(String idPath); - /** * 涓婚搴撶殑鏍� -- Gitblit v1.9.3