From 3ac8d43ba46808cfe2fb51111da2456fd02477e1 Mon Sep 17 00:00:00 2001
From: maven <2163098428@qq.com>
Date: 星期二, 08 七月 2025 11:57:29 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java | 14 +++++++++++---
1 files changed, 11 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..261159a 100644
--- a/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java
@@ -1,7 +1,11 @@
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 {
@@ -20,9 +24,13 @@
//渚涘簲鍟嗗悕绉�
private String supplierName;
//澧炲�肩◣
- 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