From f7649c532163847914e3591236e77c99fb68e1a8 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期五, 30 一月 2026 16:42:00 +0800
Subject: [PATCH] Merge branch 'dev_New' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 10 +++++++++-
1 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index 82d8b97..78169a0 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -19,6 +19,11 @@
private String projectName;
@JsonFormat(pattern = "yyyy-MM-dd")
private Date entryDate;
+
+ private String entryDateStart;
+ private String entryDateEnd;
+
+
private String salesman;
private Long customerId;
private String customerName;
@@ -41,7 +46,7 @@
private List<String> tempFileIds;
private List<CommonFile> SalesLedgerFiles;
- private Integer Type;
+ private Integer type;
@ApiModelProperty(value = "绛捐鏃ユ湡")
private LocalDate executionDate;
@@ -49,4 +54,7 @@
@ApiModelProperty(value = "浠樻鏂瑰紡")
private String paymentMethod;
+
+ @ApiModelProperty(value = "浜よ揣鏃ユ湡")
+ private LocalDate deliveryDate;
}
--
Gitblit v1.9.3