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

疯狂的狮子li

2021-06-11 a51f7d52ed93f62f5f5eeb445163ab48a523dbe2

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

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

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

import java.util.List;
@@ -10,7 +10,7 @@
 *
 * @author ruoyi
 */
public interface GenTableColumnMapper extends BaseMapper<GenTableColumn> {
public interface GenTableColumnMapper extends BaseMapperPlus<GenTableColumn> {
    /**
     * 根据表名称查询列信息
     *