From 56322786887f99604450cde07c9cab6fb5ea5135 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子Li <15040126243@163.com>
Date: 星期一, 12 七月 2021 11:39:43 +0800
Subject: [PATCH] !67 同步dev分支 Merge pull request !67 from 疯狂的狮子Li/dev

---
 ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm |   20 ++++++++++++++++++--
 1 files changed, 18 insertions(+), 2 deletions(-)

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 7452cfb..4c2b7ee 100644
--- a/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm
@@ -3,9 +3,17 @@
 import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.Date;
 
 #foreach ($import in $importList)
 import ${import};
+#end
+#if($table.crud || $table.sub)
+import com.ruoyi.common.core.domain.BaseEntity;
+#elseif($table.tree)
+import com.ruoyi.common.core.domain.TreeEntity;
 #end
 
 /**
@@ -14,10 +22,17 @@
  * @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 {
-	private static final long serialVersionUID = 1L;
+public class ${ClassName}QueryBo extends ${Entity} {
+
 	/** 鍒嗛〉澶у皬 */
 	@ApiModelProperty("鍒嗛〉澶у皬")
 	private Integer pageSize;
@@ -39,4 +54,5 @@
 	private $column.javaType $column.javaField;
 #end
 #end
+
 }

--
Gitblit v1.9.3