From 47f1f14d7788b0baf4578d3aaa5b9f989ee65210 Mon Sep 17 00:00:00 2001
From: ludc
Date: 星期三, 31 一月 2024 16:36:52 +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