From d4451c01b020645ff060649d9da7a7faef1b6512 Mon Sep 17 00:00:00 2001
From: 田源 <lastanimals@163.com>
Date: 星期三, 03 一月 2024 16:11:08 +0800
Subject: [PATCH] 主题库按钮分类授权权限

---
 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java |    6 ------
 1 files changed, 0 insertions(+), 6 deletions(-)

diff --git a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java
index eafa258..1243815 100644
--- a/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java
+++ b/Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java
@@ -8,15 +8,9 @@
 import org.springblade.core.tool.utils.Func;
 import org.springblade.core.tool.utils.SpringUtil;
 import org.springblade.core.tool.utils.StringPool;
-<<<<<<< Updated upstream
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
-=======
-
-import java.util.*;
-import java.util.stream.Collectors;
->>>>>>> Stashed changes
 
 /**
  * Description:

--
Gitblit v1.9.3