From dab99405c59a04b15e4401415c80a1981c2f22b5 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期五, 14 五月 2021 16:58:09 +0800
Subject: [PATCH] update springboot 升级 2.3.10 依赖全面升级适配

---
 ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm |   23 ++++++++++++++++++-----
 1 files changed, 18 insertions(+), 5 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 33d7d18..c7be089 100644
--- a/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm
@@ -3,12 +3,17 @@
 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
 
 /**
@@ -17,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("鍒嗛〉澶у皬")
@@ -38,11 +50,12 @@
 #foreach ($column in $columns)
 #if(!$table.isSuperColumn($column.javaField) && $column.query)
 	/** $column.columnComment */
+#if($column.javaType == 'Date')
+	@JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+#end
 	@ApiModelProperty("$column.columnComment")
 	private $column.javaType $column.javaField;
 #end
 #end
 
-	@TableField(exist = false)
-	private Map<String, Object> params = new HashMap<>();
 }

--
Gitblit v1.9.3