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-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeAttributeService.java |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeAttributeService.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeAttributeService.java
index 372316a..2e06c1f 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeAttributeService.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/service/IBtmTypeAttributeService.java
@@ -27,12 +27,6 @@
 	List<BtmTypeAttributeVO> checkAndInsert(String btmTypeOid, List<BtmTypeLinkAttributesDTO> attributesDTOList, String creator, Date now);
 
 	/**
-	 * 鎵归噺鎻掑叆
-	 * @param records 鏁版嵁瀵硅薄闆嗗悎
-	 */
-	int batchInsert(List<BtmTypeAttribute> records);
-
-	/**
 	 * 涓氬姟绫诲瀷涓婚敭鏌ュ睘鎬�
 	 * @param btmTypeOid 涓氬姟绫诲瀷涓婚敭
 	 * @return 鏌ヨ缁撴灉

--
Gitblit v1.9.3