From 92eb695ac1254708feb6e740432fc5da9e1ad42b Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期三, 08 七月 2026 15:37:12 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' into dev_山西_黎城康森商砼
---
src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderHasAllInfoDto.java | 30 ++++++++++++++++++++++++++++++
1 files changed, 30 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderHasAllInfoDto.java b/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderHasAllInfoDto.java
new file mode 100644
index 0000000..67c98dd
--- /dev/null
+++ b/src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderHasAllInfoDto.java
@@ -0,0 +1,30 @@
+package com.ruoyi.purchase.dto;
+
+import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PurchaseReturnOrderHasAllInfoDto extends PurchaseReturnOrders {
+ //渚涘簲鍟嗗悕绉�
+ private String supplierName;
+
+ // 閲囪喘鍚堝悓鍙�
+ private String purchaseContractNumber;
+
+ private String shippingTypeText;
+
+ /**
+ * 瀵瑰簲鍑哄簱鏄惁宸插鏍搁�氳繃
+ */
+ private Boolean stockOutApproved;
+
+ //閫�鏂欎汉濮撳悕
+ private String returnUserName;
+
+ //鍒跺崟浜哄鍚�
+ private String createUserName;
+}
--
Gitblit v1.9.3