From 0adbf58fd15052d8a044cf66eaa8afaa8591ba74 Mon Sep 17 00:00:00 2001
From: gongchunyi <deslre0381@gmail.com>
Date: 星期二, 27 一月 2026 17:36:46 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java b/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java
index 52c3b22..a4c585b 100644
--- a/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/SalesLedgerImportDto.java
@@ -31,6 +31,8 @@
private String salesman;
@Excel(name = "瀹㈡埛鍚嶇О")
private String customerName;
+ @Excel(name = "椤圭洰鍚嶇О")
+ private String projectName;
@Excel(name = "褰曞叆浜�")
private String entryPerson;
@Excel(name = "澶囨敞")
@@ -41,8 +43,9 @@
@Excel(name = "绛捐鏃ユ湡", width = 30, dateFormat = "yyyy-MM-dd")
private Date executionDate;
- @Excel(name = "鍚堝悓閲戦")
- private BigDecimal contractAmount;
+ @ApiModelProperty(value = "浠樻鏂瑰紡")
+ @Excel(name = "浠樻鏂瑰紡")
+ private String paymentMethod;
}
--
Gitblit v1.9.3