From b2859e20392f07094ec84166b83e6189665404c2 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期六, 12 七月 2025 17:09:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/pim_yys'
---
src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java | 18 +++++++++++++++---
1 files changed, 15 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java b/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java
index b375739..1a3396d 100644
--- a/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java
@@ -1,10 +1,16 @@
package com.ruoyi.purchase.dto;
+import com.ruoyi.other.pojo.TempFile;
import com.ruoyi.purchase.pojo.ProductRecord;
+import com.ruoyi.sales.pojo.CommonFile;
import lombok.Data;
+
+import java.util.List;
@Data
public class ProductRecordDto extends ProductRecord {
+
+ private Long ticketRegistrationId;
//閿�鍞悎鍚屽彿
private String salesContractNo;
@@ -19,10 +25,16 @@
private String purchaseContractNumber;
//渚涘簲鍟嗗悕绉�
private String supplierName;
+ private Long issUerId;
+ private String issUer;
//澧炲�肩◣
- private String invoiceAmount;
+ private String invoiceAmount = "0";
- private String invoiceNumber;
+ private String invoiceNumber = "0";
- private String unTicketsPrice;
+ private String unTicketsPrice = "0";
+
+ private List<CommonFile> commonFiles;
+
+ private List<String> tempFileIds;
}
--
Gitblit v1.9.3