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

疯狂的狮子li

2021-09-26 6f6a3566ac50bcb9bcae4ae68744c9f49b75933c

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