forked from moral

parent: 776f2041 | patch | commit | ignore whitespace
cjl
2023-10-25 04051af6a3115d73dab6935d06ebd70334484962 
Merge remote-tracking branch 'origin/cjl' into cjl

# Conflicts:
#	screen-api/src/main/java/com/moral/api/service/SysDictTypeService.java
#	screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java
2 files modified
2 ■■■■■ changed files
screen-api/src/main/java/com/moral/api/service/SysDictTypeService.java 1 ●●●●● patch | view | raw | blame | history
screen-api/src/main/java/com/moral/api/service/impl/SysDictTypeServiceImpl.java 1 ●●●●● patch | view | raw | blame | history 
 screen-api/src/main/java/com/moral/api/service/SysDictTypeService.java


@@ -26,4 +26,5 @@


    List<Integer> dateValueList(String code);


    //获取某个类型数据


    SysDictType slectFind(String name);




}




 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;