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

疯狂的狮子li

2021-10-28 f5f16aac96772c109658b5ae1b48874008e0959a

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