!6 同步develop分支

* sync -- 同步develop分支

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

@@ -1,7 +1,8 @@
 package ${packageName}.mapper;
 
 import ${packageName}.domain.${ClassName};
-import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
+import ${packageName}.domain.vo.${ClassName}Vo;
+import com.ruoyi.common.core.mapper.BaseMapperPlus;
 
 /**
  * ${functionName}Mapper接口
@@ -9,6 +10,6 @@ import com.ruoyi.common.core.mybatisplus.core.BaseMapperPlus;
  * @author ${author}
  * @date ${datetime}
  */
-public interface ${ClassName}Mapper extends BaseMapperPlus<${ClassName}> {
+public interface ${ClassName}Mapper extends BaseMapperPlus<${ClassName}Mapper, ${ClassName}, ${ClassName}Vo> {
 
 }