From e4c10a806ff29d18cdbdd182a5930316eae3fd83 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期二, 07 四月 2026 09:29:59 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_新疆_大罗素马铃薯

---
 src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java |    7 +++++++
 1 files changed, 7 insertions(+), 0 deletions(-)

diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java
index 2de8642..c0b98e6 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java
@@ -1,10 +1,17 @@
 package com.ruoyi.purchase.dto;
 
+import com.ruoyi.purchase.pojo.PurchaseReturnOrderProducts;
 import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
 import lombok.Data;
+
+import java.util.List;
 
 @Data
 public class PurchaseReturnOrderDto extends PurchaseReturnOrders {
     // 鏄惁浣跨敤绯荤粺鍗曞彿
     private Boolean isDefaultNo;
+
+    private String supplierName;
+
+    private List<PurchaseReturnOrderProductsDto> purchaseReturnOrderProductsDtos;
 }

--
Gitblit v1.9.3