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