Merge remote-tracking branch 'origin/satoken' into dev

疯狂的狮子li

2022-01-13 6ca853516671882e8e54d9630a4299f12fbcf9aa

 ruoyi-system/src/main/java/com/ruoyi/system/service/ISysDictTypeService.java

@@ -13,7 +13,7 @@
 *
 * @author Lion Li
 */
public interface ISysDictTypeService extends IService<SysDictType> {
public interface ISysDictTypeService {


    TableDataInfo<SysDictType> selectPageDictTypeList(SysDictType dictType, PageQuery pageQuery);