From bc1a95cb1a7d2cbb2a4b8e7a043fc82f3b2ba119 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期一, 30 三月 2026 13:57:29 +0800
Subject: [PATCH] yys 1.设备

---
 src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java |   18 ++++++++++++++++--
 1 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
index a3f2f1d..672ebc2 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -17,8 +17,13 @@
     private String salesContractNo;
     private String customerContractNo;
     private String projectName;
-//    @JsonFormat(pattern = "yyyy-MM-dd")
-    private String entryDate;
+    @JsonFormat(pattern = "yyyy-MM-dd")
+    private Date entryDate;
+
+    private String entryDateStart;
+    private String entryDateEnd;
+
+
     private String salesman;
     private Long customerId;
     private String customerName;
@@ -49,4 +54,13 @@
 
     @ApiModelProperty(value = "浠樻鏂瑰紡")
     private String paymentMethod;
+
+    @ApiModelProperty(value = "璁㈠崟鎸夌揣鎬ョ▼搴﹀垎绫�(鏅��/绱ф��)")
+    private String salesType;
+
+    @ApiModelProperty(value = "1-寰呭鏍革紝2-瀹℃壒涓紝3-瀹℃壒閫氳繃锛�4-瀹℃壒澶辫触")//榛樿鏄�1
+    private Integer approvalStatus;
+
+    // 瀹℃壒浜�
+    private String approveUserIds;
 }

--
Gitblit v1.9.3