From d642c08c2e8dd36ebeb532b30a66026dd427cb64 Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期日, 18 七月 2021 18:19:16 +0800
Subject: [PATCH] update 优化代码生成器注释格式

---
 ruoyi-generator/src/main/resources/vm/java/queryBo.java.vm |   45 ++++++++++++++++++++++++++++++++-------------
 1 files changed, 32 insertions(+), 13 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..537ff73 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,32 +22,47 @@
  * @author ${author}
  * @date ${datetime}
  */
-@Data
-@ApiModel("${functionName}鍒嗛〉鏌ヨ瀵硅薄")
-public class ${ClassName}QueryBo {
+#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 extends ${Entity} {
+
+	/**
+	 * 鍒嗛〉澶у皬
+	 */
 	@ApiModelProperty("鍒嗛〉澶у皬")
 	private Integer pageSize;
-	/** 褰撳墠椤垫暟 */
+	/**
+	 * 褰撳墠椤垫暟
+	 */
 	@ApiModelProperty("褰撳墠椤垫暟")
 	private Integer pageNum;
-	/** 鎺掑簭鍒� */
+	/**
+	 * 鎺掑簭鍒�
+	 */
 	@ApiModelProperty("鎺掑簭鍒�")
 	private String orderByColumn;
-	/** 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc */
+	/**
+	 * 鎺掑簭鐨勬柟鍚慸esc鎴栬�卆sc
+	 */
 	@ApiModelProperty(value = "鎺掑簭鐨勬柟鍚�", example = "asc,desc")
 	private String isAsc;
 
 
 #foreach ($column in $columns)
 #if(!$table.isSuperColumn($column.javaField) && $column.query)
-	/** $column.columnComment */
+    /**
+     * $column.columnComment
+     */
 	@ApiModelProperty("$column.columnComment")
 	private $column.javaType $column.javaField;
 #end
 #end
 
-	@TableField(exist = false)
-	private Map<String, Object> params = new HashMap<>();
 }

--
Gitblit v1.9.3