From fb40c4dfec5954c321f38bb86e9d07eb87b97bfd Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期三, 18 三月 2026 08:21:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_衡阳_鹏创电子' into dev_衡阳_鹏创电子
---
src/main/java/com/ruoyi/sales/dto/CustomerInteractionDto.java | 6 ++++++
1 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/sales/dto/CustomerInteractionDto.java b/src/main/java/com/ruoyi/sales/dto/CustomerInteractionDto.java
index 2ad0a24..aab0f9e 100644
--- a/src/main/java/com/ruoyi/sales/dto/CustomerInteractionDto.java
+++ b/src/main/java/com/ruoyi/sales/dto/CustomerInteractionDto.java
@@ -17,6 +17,12 @@
/** 搴旀敹閲戦 */
private BigDecimal unReceiptAmount;
+ /** 閿�鍞悎鍚屽彿 */
+ private String salesContractNo;
+
+ /** 閲囪喘鍚堝悓鍙� */
+ private String purchaseContractNo;
+
/** 鍙戠敓鏃ユ湡 */
private LocalDate happenTime;
--
Gitblit v1.9.3