From d112a6f7db4cb97d40850a70b7d6041ffc31adc5 Mon Sep 17 00:00:00 2001
From: liding <756868258@qq.com>
Date: 星期一, 19 五月 2025 11:35:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java | 24 ++++++++++++++++++++++--
1 files changed, 22 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
index def3993..a0ee1fe 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseLedgerDto.java
@@ -1,7 +1,7 @@
package com.ruoyi.purchase.dto;
import com.fasterxml.jackson.annotation.JsonFormat;
-import com.ruoyi.sales.pojo.SalesLedgerFile;
+import com.ruoyi.sales.pojo.CommonFile;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.Data;
@@ -17,6 +17,12 @@
* 閲囪喘鍚堝悓鍙�
*/
private String purchaseContractNumber;
+
+
+ /**
+ * 渚涘簲鍟嗗悕绉癷d
+ */
+ private Long supplierId;
/**
* 渚涘簲鍟嗗悕绉�
@@ -38,6 +44,11 @@
* 閿�鍞悎鍚屽彿
*/
private String salesContractNo;
+
+ /**
+ * 閿�鍞悎鍚屽彿id
+ */
+ private Long salesContractNoId;
/**
* 椤圭洰鍚嶇О
@@ -85,6 +96,15 @@
private List<String> tempFileIds;
- private List<SalesLedgerFile> SalesLedgerFiles;
+ private List<CommonFile> SalesLedgerFiles;
+ /**
+ * 涓氬姟鍛樻墜鏈哄彿
+ */
+ private String phoneNumber;
+
+ /**
+ * 涓氬姟鍛榠d
+ */
+ private Long businessPersonId;
}
--
Gitblit v1.9.3