From f093da99ecb963d19d62dc0f242f00b20bc8895c Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 14 四月 2021 13:22:31 +0800
Subject: [PATCH] Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue into dev
---
ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm | 21 +++++++++++++++++----
1 files changed, 17 insertions(+), 4 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..b641ac3 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,21 @@
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 +24,15 @@
* @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("鍒嗛〉澶у皬")
@@ -39,11 +51,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