Merge remote-tracking branch 'origin/master'

wangting

2023-08-01 85c3a98a228340863fb7507586b2c7cf7231e299

 Source/UBCS/ubcs-service-api/ubcs-omd-api/src/main/java/com/vci/ubcs/omd/cache/BtmTypeCache.java

@@ -8,7 +8,6 @@
import org.springblade.core.tool.utils.Func;
import org.springblade.core.tool.utils.SpringUtil;
import org.springblade.core.tool.utils.StringPool;

import java.util.ArrayList;
import java.util.Collection;
import java.util.List;