diff --git a/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm b/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm
index 93e28822..865ede4a 100644
--- a/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm
@@ -1,9 +1,10 @@
 package ${packageName}.bo;
 
-import com.baomidou.mybatisplus.annotation.TableField;
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
 import java.util.Date;
 import java.util.Map;
 import java.util.HashMap;
@@ -18,9 +19,15 @@ import ${import};
  * @author ${author}
  * @date ${datetime}
  */
+#if($table.crud || $table.sub)
+#set($Entity="BaseEntity")
+#elseif($table.tree)
+#set($Entity="TreeEntity")
+#end
 @Data
+@EqualsAndHashCode(callSuper = true)
 @ApiModel("${functionName}分页查询对象")
-public class ${ClassName}QueryBo {
+public class ${ClassName}QueryBo extends ${Entity} {
 
 	/** 分页大小 */
 	@ApiModelProperty("分页大小")
@@ -44,6 +51,4 @@ public class ${ClassName}QueryBo {
 #end
 #end
 
-	@TableField(exist = false)
-	private Map<String, Object> params = new HashMap<>();
 }
diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
index 7d44eaa1..bf6d5e2a 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -53,6 +53,7 @@ public class ${ClassName}ServiceImpl extends ServiceImpl<${ClassName}Mapper, ${C
 #end
         lqw.$mpMethod($condition, ${ClassName}::get$AttrName, bo.get$AttrName());
 #else
+        lqw.apply(bo.getParams().get("dataScope") != null,bo.getParams().get("dataScope").toString());
         Map<String, Object> params = bo.getParams();
         if (params.get("begin$AttrName") != null && params.get("end$AttrName") != null) {
             lqw.between(${ClassName}::get$AttrName ,params.get("begin$AttrName"), params.get("end$AttrName"));