From 8bda10c23c7a7d772669e610e56e80de099b0747 Mon Sep 17 00:00:00 2001
From: CharlieJohn <8595764@qq.com>
Date: 星期四, 17 六月 2021 09:30:52 +0800
Subject: [PATCH] !54 fix 生成器生成的 service 和 serviceImpl 中 deleteWithValidByIds 参数字段类型错误 * fix 生成器生成的 service 和 serviceImpl 中 deleteWithValidByIds 参数字段类型错误

---
 ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm |   21 +++++++++++++++------
 1 files changed, 15 insertions(+), 6 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 93e2882..4c2b7ee 100644
--- a/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm
@@ -1,15 +1,19 @@
 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;
 
 #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
 
 /**
@@ -18,9 +22,16 @@
  * @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 +55,4 @@
 #end
 #end
 
-	@TableField(exist = false)
-	private Map<String, Object> params = new HashMap<>();
 }

--
Gitblit v1.9.3