Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev

疯狂的狮子li

2022-01-04 1c7d840ff66aecc10654e577f898cea0d0ba96ca

 ruoyi-generator/src/main/resources/vm/java/mapper.java.vm

@@ -1,7 +1,7 @@
package ${packageName}.mapper;

import ${packageName}.domain.${ClassName};
import com.ruoyi.common.core.page.BaseMapperPlus;
import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;

/**
 * ${functionName}Mapper接口