From d7eba1786ed1fba2b3674f9da3af4fbf1a3f8692 Mon Sep 17 00:00:00 2001 From: fujunling <2984387807@qq.com> Date: 星期四, 01 六月 2023 18:49:05 +0800 Subject: [PATCH] 解决冲突 --- Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java | 17 +++++++++++++++-- 1 files changed, 15 insertions(+), 2 deletions(-) diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java index 83e37e6..e62eacf 100644 --- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java +++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/IDockingPreAttrMappingService.java @@ -4,6 +4,9 @@ import com.baomidou.mybatisplus.extension.service.IService; import com.vci.ubcs.code.webservice.entity.DockingPreAttrMapping; import com.vci.ubcs.code.webservice.vo.DockingPreAttrMappingVO; +import com.vci.ubcs.code.webservice.vo.DokingAttributeSerchVO; +import com.vci.ubcs.starter.exception.VciBaseException; +import org.springblade.core.tool.api.R; import java.util.List; @@ -35,7 +38,17 @@ */ public List<DockingPreAttrMappingVO> batchAddSave(List<DockingPreAttrMappingVO> dockingPreAttrMappingDTOS)throws Exception; + /*** + *鏍￠獙灞炴�ф槧灏勬槸鍚﹂厤缃繃 + * @param targetClassifyId + * @param sourceClassifyId + * @return + */ + boolean checkHasConfigByTragetCodeclassifyId(String targetClassifyId,String sourceClassifyId); - boolean checkHasConfigByTragetCodeclassifyId(String targetClassifyId); - + /*** + * 灞炴�ф煡璇� + * @return + */ + public R search(DokingAttributeSerchVO dokingAttributeSerchVO); } -- Gitblit v1.9.3