Merge remote-tracking branch 'origin/cjl' into cjl

cjl

2023-10-25 04051af6a3115d73dab6935d06ebd70334484962

 screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java

@@ -2,6 +2,7 @@

import com.moral.api.config.Interceptor.UserHelper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.moral.api.config.Interceptor.UserHelper;
import com.moral.api.entity.SysDictData;
import com.moral.api.entity.SysDictType;
import com.moral.api.mapper.SysDictTypeMapper;