From 15b711910e8f8c3b34a6ab2fb28d5d78280f7505 Mon Sep 17 00:00:00 2001
From: xiejun <xj@2023>
Date: 星期二, 30 五月 2023 18:27:32 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java |   10 ++++++++--
 1 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java
index 8764874..15fbcdc 100644
--- a/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java
+++ b/Source/UBCS/ubcs-service/ubcs-webservice/src/main/java/com/vci/ubcs/code/webservice/service/impl/DockingPreAttrMappingServiceImpl.java
@@ -8,6 +8,7 @@
 import com.vci.ubcs.code.webservice.service.IDockingPreAttrMappingService;
 import com.vci.ubcs.code.webservice.service.IDockingPreAttrRangeService;
 import com.vci.ubcs.code.webservice.service.IDockingPreMetaAttrService;
+import com.vci.ubcs.code.webservice.vo.DokingAttributeSerchVO;
 import com.vci.ubcs.code.webservice.wrapper.DockingPreAttrMappingWrapper;
 import com.vci.ubcs.code.webservice.wrapper.DockingPreAttrRangeWrapper;
 import com.vci.ubcs.starter.exception.VciBaseException;
@@ -19,7 +20,9 @@
 import com.vci.ubcs.code.webservice.entity.DockingPreMetaAttr;
 import com.vci.ubcs.code.webservice.vo.DockingPreAttrMappingVO;
 import com.vci.ubcs.code.webservice.vo.DockingPreAttrRangeVO;
+import org.springblade.core.tool.api.R;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -37,8 +40,6 @@
 @Service
 public class DockingPreAttrMappingServiceImpl extends ServiceImpl<DockingPreAttrMappingMapper, DockingPreAttrMapping> implements IDockingPreAttrMappingService {
 
-
-
 	/***
 	 * 闆嗗洟鍒嗙被灞炴�у睘鎬ф槧灏勯厤缃湇鍔�
 	 */
@@ -206,6 +207,11 @@
 		}
 	}
 
+	@Override
+	public R search(DokingAttributeSerchVO dokingAttributeSerchVO) {
+		return null;
+	}
+
 
 	/***
 	 * 瀵硅薄杞崲

--
Gitblit v1.10.0