From b4a9e12e00b78e1aef8acda070434de9ffd0d66a Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期五, 24 四月 2026 15:29:19 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java
index f10a853..926221c 100644
--- a/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java
@@ -1,16 +1,20 @@
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;
+@EqualsAndHashCode(callSuper = true)
@Data
public class PurchaseReturnOrderDto extends PurchaseReturnOrders {
// 鏄惁浣跨敤绯荤粺鍗曞彿
private Boolean isDefaultNo;
+ private String supplierName;
private List<PurchaseReturnOrderProductsDto> purchaseReturnOrderProductsDtos;
+
+ private Long[] deptIds;
}
--
Gitblit v1.9.3