From 620bb4712a31791231c4381581f0f60088f079fe Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 27 五月 2026 14:03:45 +0800
Subject: [PATCH] Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈
---
src/main/java/com/ruoyi/account/bean/dto/sales/SalesReturnDto.java | 8 +++++---
1 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/account/bean/dto/sales/SalesReturnDto.java b/src/main/java/com/ruoyi/account/bean/dto/sales/SalesReturnDto.java
index 1c6e266..5a239ae 100644
--- a/src/main/java/com/ruoyi/account/bean/dto/sales/SalesReturnDto.java
+++ b/src/main/java/com/ruoyi/account/bean/dto/sales/SalesReturnDto.java
@@ -5,7 +5,7 @@
import lombok.Data;
import org.springframework.format.annotation.DateTimeFormat;
-import java.util.Date;
+import java.time.LocalDate;
@Data
@Schema(name = "SalesReturnDto", description = "璐㈠姟绠＄悊--閿�鍞��璐у彴璐�(浼犲弬)")
@@ -14,16 +14,18 @@
@Schema(description = "閫�璐у崟鍙�")
private String returnNo;
+ private Long customerId;
+
@Schema(description = "瀹㈡埛鍚嶇О")
private String customerName;
@Schema(description = "寮�濮嬫棩鏈�")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date startDate;
+ private LocalDate startDate;
@Schema(description = "缁撴潫鏃ユ湡")
@JsonFormat(pattern = "yyyy-MM-dd")
@DateTimeFormat(pattern = "yyyy-MM-dd")
- private Date endDate;
+ private LocalDate endDate;
}
--
Gitblit v1.9.3