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

疯狂的狮子li

2021-12-13 29c46a15f9cb4fa3ea0f417cca0ac76ff35bd135

 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接口