From 382b1b105abacd983061a000674ba7da446407d2 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 21 四月 2026 09:26:12 +0800
Subject: [PATCH] fix: 添加@EqualsAndHashCode注解

---
 src/main/java/com/ruoyi/account/pojo/AccountIncome.java |   14 +++++++++++++-
 1 files changed, 13 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/ruoyi/account/pojo/AccountIncome.java b/src/main/java/com/ruoyi/account/pojo/AccountIncome.java
index e5d6c37..3dae2d0 100644
--- a/src/main/java/com/ruoyi/account/pojo/AccountIncome.java
+++ b/src/main/java/com/ruoyi/account/pojo/AccountIncome.java
@@ -6,6 +6,7 @@
 import com.ruoyi.framework.aspectj.lang.annotation.Excel;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 import org.springframework.format.annotation.DateTimeFormat;
 
 import javax.validation.constraints.NotBlank;
@@ -20,6 +21,7 @@
  */
 @TableName(value = "account_income")
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class AccountIncome extends DateQueryDto  implements Serializable {
     private static final long serialVersionUID = 1L;
 
@@ -28,6 +30,16 @@
      */
     @TableId(type = IdType.AUTO)
     private Long id;
+
+    /**
+     * 涓氬姟id
+     */
+    private Long businessId;
+
+    /**
+     * 涓氬姟绫诲瀷 1-鍥炴 2-鍊熸
+     */
+    private Integer businessType;
 
     /**
      * 鏀跺叆鏃ユ湡
@@ -40,7 +52,7 @@
     /**
      * 鏀跺叆绫诲瀷(閿�鍞敹鍏ワ紝鏈嶅姟鏀跺叆锛屽叾浠栨敹鍏�)
      */
-    @Excel(name = "鏀跺叆绫诲瀷",readConverterExp = "0=閿�鍞敹鍏�,1=鏈嶅姟鏀跺叆,2=鍏朵粬鏀跺叆")
+    @Excel(name = "鏀跺叆绫诲瀷",readConverterExp = "0=閿�鍞敹鍏�,1=鏈嶅姟鏀跺叆,2=鍏朵粬鏀跺叆,3=鍥炴鏀跺叆")
     @NotBlank(message = "鏀跺叆绫诲瀷涓嶈兘涓虹┖!!")
     private String incomeType;
 

--
Gitblit v1.9.3