Merge branch 'master' of gitee.com:JavaLionLi/RuoYi-Vue-Plus into dev

疯狂的狮子Li

2021-09-07 3b5fb07c3d8340feab01c09af8ab973a497b5e02

 ruoyi-generator/src/main/java/com/ruoyi/generator/mapper/GenTableColumnMapper.java

@@ -1,6 +1,6 @@
package com.ruoyi.generator.mapper;

import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
import com.ruoyi.generator.domain.GenTableColumn;

import java.util.List;