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

疯狂的狮子li

2021-07-12 fdad98b321bec5d6fbb97ae1a2a1939708fa703f

 ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysDictTypeMapper.java

@@ -1,7 +1,7 @@
package com.ruoyi.system.mapper;

import com.ruoyi.common.core.domain.entity.SysDictType;
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;

/**
 * 字典表 数据层