From aebe45bdaed061e6a6f2a02d26e506f58884bce3 Mon Sep 17 00:00:00 2001
From: zivzhong <a126zzs@126.com>
Date: Wed, 8 Jun 2022 16:13:52 +0000
Subject: [PATCH] =?UTF-8?q?###=20=E6=9B=B4=E6=94=B9=E7=9B=AE=E7=9A=84=20?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E7=94=9F=E6=88=90=E4=BF=AE=E5=A4=8D=E4=BA=86?=
 =?UTF-8?q?=E7=9A=84=E4=B8=80=E4=BA=9B=E5=B0=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

### 描述 代码生成修复了的一些小问题


### 测试 生成代码测试
---
 .../src/main/resources/vm/java/domain.java.vm         |  2 ++
 .../src/main/resources/vm/java/service.java.vm        | 11 ++++++-----
 .../src/main/resources/vm/java/serviceImpl.java.vm    |  3 ++-
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
index 8fde4adea..29fa9154b 100644
--- a/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/domain.java.vm
@@ -2,6 +2,7 @@ package ${packageName}.domain;
 
 import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
 import java.io.Serializable;
 import java.util.Date;
@@ -28,6 +29,7 @@ import com.ruoyi.common.core.domain.TreeEntity;
     #set($Entity="TreeEntity<${ClassName}>")
 #end
 @Data
+@EqualsAndHashCode(callSuper = false)
 @TableName("${tableName}")
 public class ${ClassName} extends ${Entity} {
 
diff --git a/ruoyi-generator/src/main/resources/vm/java/service.java.vm b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
index 309328ca3..f8ee99148 100644
--- a/ruoyi-generator/src/main/resources/vm/java/service.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/service.java.vm
@@ -31,7 +31,8 @@ public interface I${ClassName}Service {
     /**
      * 查询${functionName}列表
      *
-     * @param ${className} ${functionName}
+     * @param bo ${functionName}
+     * @param pageQuery 分页查询实体类
      * @return ${functionName}集合
      */
     TableDataInfo<${ClassName}Vo> queryPageList(${ClassName}Bo bo, PageQuery pageQuery);
@@ -40,7 +41,7 @@ public interface I${ClassName}Service {
     /**
      * 查询${functionName}列表
      *
-     * @param ${className} ${functionName}
+     * @param bo ${functionName}
      * @return ${functionName}集合
      */
     List<${ClassName}Vo> queryList(${ClassName}Bo bo);
@@ -48,7 +49,7 @@ public interface I${ClassName}Service {
     /**
      * 修改${functionName}
      *
-     * @param ${className} ${functionName}
+     * @param bo ${functionName}
      * @return 结果
      */
     Boolean insertByBo(${ClassName}Bo bo);
@@ -56,7 +57,7 @@ public interface I${ClassName}Service {
     /**
      * 修改${functionName}
      *
-     * @param ${className} ${functionName}
+     * @param bo ${functionName}
      * @return 结果
      */
     Boolean updateByBo(${ClassName}Bo bo);
@@ -64,7 +65,7 @@ public interface I${ClassName}Service {
     /**
      * 校验并批量删除${functionName}信息
      *
-     * @param ${pkColumn.javaField}s 需要删除的${functionName}主键集合
+     * @param ids 需要删除的${functionName}主键集合
      * @param isValid 是否校验,true-删除前校验,false-不校验
      * @return 结果
      */
diff --git a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
index 005c84a9f..896686d5f 100644
--- a/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
+++ b/ruoyi-generator/src/main/resources/vm/java/serviceImpl.java.vm
@@ -141,7 +141,8 @@ public class ${ClassName}ServiceImpl implements I${ClassName}Service {
     /**
      * 批量删除${functionName}
      *
-     * @param ${pkColumn.javaField}s 需要删除的${functionName}主键
+     * @param ids 需要删除的${functionName}主键
+     * @param isValid 是否校验,true-删除前校验,false-不校验
      * @return 结果
      */
     @Override