Merge remote-tracking branch 'origin/master'

田源

2023-08-01 19d2e5d34ae80d454c3d0854ffc7a712d63caabc

 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;