From aab9f74b97df038154d507b6d17b6f96a8337efc Mon Sep 17 00:00:00 2001 From: zss <zss@example.com> Date: 星期四, 03 七月 2025 13:46:18 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java | 11 ++++++++--- 1 files changed, 8 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..92c4b86 100644 --- a/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java +++ b/src/main/java/com/ruoyi/purchase/dto/ProductRecordDto.java @@ -1,7 +1,10 @@ package com.ruoyi.purchase.dto; 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 +23,11 @@ //渚涘簲鍟嗗悕绉� 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; } -- Gitblit v1.9.3