Merge remote-tracking branch 'origin/master'

xiejun

2023-06-14 8e20385ac0712b1a27420970c183482763cf4f6c

 Source/UBCS/ubcs-service/ubcs-system/src/main/java/com/vci/ubcs/system/service/impl/DictServiceImpl.java

@@ -25,7 +25,7 @@
import com.vci.ubcs.system.wrapper.DictWrapper;
import com.vci.ubcs.common.constant.CommonConstant;
import org.springblade.core.cache.utils.CacheUtil;
import com.vci.ubcs.core.log.exception.ServiceException;
import org.springblade.core.log.exception.ServiceException;
import org.springblade.core.mp.support.Condition;
import org.springblade.core.mp.support.Query;
import org.springblade.core.tool.constant.BladeConstant;