From a62b1426d01ccba34a9cd92c41e392db6fa59d90 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期一, 30 三月 2026 09:40:41 +0800
Subject: [PATCH] 销售审批合同字段修改
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java | 20 ++++++++++++++++++--
1 files changed, 18 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..e2fc277 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerDto.java
@@ -7,6 +7,7 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import java.math.BigDecimal;
import java.time.LocalDate;
import java.util.Date;
import java.util.List;
@@ -17,8 +18,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 BigDecimal contractAmount;
private String salesman;
private Long customerId;
private String customerName;
@@ -49,4 +55,14 @@
@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