From cfededd9721be4322e660fc879f11a806fcc7963 Mon Sep 17 00:00:00 2001
From: weidy <lastanimals@163.com>
Date: 星期二, 20 六月 2023 17:07:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/AttributeMapper.java |   17 ++++++-----------
 1 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/AttributeMapper.java b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/AttributeMapper.java
index 45f779a..f54419c 100644
--- a/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/AttributeMapper.java
+++ b/Source/UBCS/ubcs-service/ubcs-omd/src/main/java/com/vci/ubcs/omd/mapper/AttributeMapper.java
@@ -1,6 +1,8 @@
 package com.vci.ubcs.omd.mapper;
 
 import com.vci.ubcs.omd.entity.Attribute;
+import com.vci.ubcs.omd.entity.BtmType;
+import com.vci.ubcs.omd.vo.BtmTypeVO;
 import org.springblade.core.mp.mapper.BladeMapper;
 
 import java.util.Collection;
@@ -21,16 +23,9 @@
 	List<Attribute> selectAll();
 
 	/**
-	 * 涓婚敭鏌ヨ
-	 * @param primaryKey 涓婚敭
-	 * @return 鏌ヨ缁撴灉
+	 * 鏌ヨ搴旂敤鐨勪笟鍔＄被鍨�
+	 * @param oid
+	 * @return
 	 */
-	Attribute selectByPrimaryKey(Long primaryKey);
-
-	/**
-	 * 涓婚敭鎵归噺鏌ヨ
-	 * @param primaryKeyCollection 涓婚敭闆嗗悎
-	 * @return 鏌ヨ缁撴灉
-	 */
-	List<Attribute> selectByPrimaryKeyCollection(Collection<String> primaryKeyCollection);
+	List<BtmType> selectApplyRange(String oid);
 }

--
Gitblit v1.9.3