From 4f39e676277d7a66e13d172288032ce16bb18e8c Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 22 四月 2026 17:05:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_河南_鹤壁天沐钢化玻璃厂' into dev_河南_鹤壁天沐钢化玻璃厂

---
 src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java |    9 +++++++++
 1 files changed, 9 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..f0436fc 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java
@@ -1,10 +1,19 @@
 package com.ruoyi.purchase.dto;
 
+import com.ruoyi.purchase.pojo.PurchaseReturnOrderProducts;
 import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
+
+import java.util.List;
 
 @Data
+@EqualsAndHashCode(callSuper = true)
 public class PurchaseReturnOrderDto extends PurchaseReturnOrders {
     // 鏄惁浣跨敤绯荤粺鍗曞彿
     private Boolean isDefaultNo;
+
+    private String supplierName;
+
+    private List<PurchaseReturnOrderProductsDto> purchaseReturnOrderProductsDtos;
 }

--
Gitblit v1.9.3