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/sales/dto/ReceiptPaymentDto.java | 23 ++++++++++++++++++++++-
1 files changed, 22 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
index cc9b935..91b477a 100644
--- a/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/ReceiptPaymentDto.java
@@ -1,31 +1,52 @@
package com.ruoyi.sales.dto;
import com.baomidou.mybatisplus.annotation.TableField;
+import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.framework.aspectj.lang.annotation.Excel;
import com.ruoyi.sales.pojo.ReceiptPayment;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import lombok.EqualsAndHashCode;
+import org.springframework.format.annotation.DateTimeFormat;
import java.math.BigDecimal;
import java.time.LocalDate;
+import java.util.Date;
@Data
+@EqualsAndHashCode(callSuper = true)
public class ReceiptPaymentDto extends ReceiptPayment {
@ApiModelProperty(value = "瀹㈡埛鍚堝悓鍙�")
@Excel(name = "瀹㈡埛鍚堝悓鍙�")
private String customerContractNo;
+ @ApiModelProperty(value = "鐘舵��")
+ @Excel(name = "鐘舵��")
+ private String statusName;
+
+
@ApiModelProperty(value = "瀹㈡埛鍚嶇О")
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
+
+ @JsonFormat(pattern = "yyyy-MM-dd",timezone = "GMT+8")
+ @DateTimeFormat(pattern = "yyyy-MM-dd")
+ @Excel(name = "寮�绁ㄦ棩鏈�",width = 30,dateFormat = "yyyy-MM-dd")
+ @ApiModelProperty(value = "寮�绁ㄦ棩鏈�")
+ private Date invoiceDate;
+
+ @TableField(exist = false)
+ private String invoiceDateStart;
+ @TableField(exist = false)
+ private String invoiceDateEnd;
@ApiModelProperty(value = "鏌ヨ鏂囨湰")
private String searchText;
@ApiModelProperty(value = "閿�鍞彴璐ales_ledger")
@Excel(isExport = false)
- private Integer salesLedgerId;
+ private Long salesLedgerId;
@ApiModelProperty(value = "閿�鍞悎鍚屽彿")
@Excel(name = "閿�鍞悎鍚屽彿")
--
Gitblit v1.9.3