From dfe6c610fe4a6b2c99dc9ee66ef8f6fe1c89ceda Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期三, 22 四月 2026 11:19:29 +0800
Subject: [PATCH] feat: 入库审批添加关联订单信息和产品明细
---
src/main/java/com/ruoyi/account/pojo/AccountExpense.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/pojo/AccountExpense.java b/src/main/java/com/ruoyi/account/pojo/AccountExpense.java
index c87f423..1680e5d 100644
--- a/src/main/java/com/ruoyi/account/pojo/AccountExpense.java
+++ b/src/main/java/com/ruoyi/account/pojo/AccountExpense.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_expense")
@Data
+@EqualsAndHashCode(callSuper = true)
public class AccountExpense extends DateQueryDto implements Serializable {
private static final long serialVersionUID = 1L;
@@ -35,7 +37,7 @@
private Long businessId;
/**
- * 涓氬姟绫诲瀷 1-浠樻 2-杩樻
+ * 涓氬姟绫诲瀷 1-浠樻 2-杩樻 3-钖祫鍙戞斁
*/
private Integer businessType;
@@ -48,9 +50,9 @@
private Date expenseDate;
/**
- * 鏀嚭绫诲瀷(鍔炲叕鐢ㄥ搧锛屽憳宸ュ伐璧勶紝宸梾璐癸紝璁惧璐圭敤锛屽叾浠�)
+ * 鏀嚭绫诲瀷(鍔炲叕鐢ㄥ搧锛屽憳宸ュ伐璧勶紝宸梾璐癸紝璁惧璐圭敤锛屾潵绁ㄤ粯娆撅紝鍏朵粬)
*/
- @Excel(name = "鏀嚭绫诲瀷",readConverterExp = "0=鍔炲叕鐢ㄥ搧,1=鍛樺伐宸ヨ祫,2=宸梾璐�,3=璁惧璐圭敤,4=鍏朵粬")
+ @Excel(name = "鏀嚭绫诲瀷",readConverterExp = "0=鍔炲叕鐢ㄥ搧,1=鍛樺伐宸ヨ祫,2=宸梾璐�,3=璁惧璐圭敤,4=鏉ョエ浠樻,5=鍏朵粬")
@NotBlank(message = "鏀嚭绫诲瀷涓嶈兘涓虹┖!!")
private String expenseType;
--
Gitblit v1.9.3