From f802cb9f7ed452142fa001511621dff08ca77585 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 09 五月 2026 16:35:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro
---
src/main/java/com/ruoyi/purchase/vo/PurchaseReturnDetailsVo.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/main/java/com/ruoyi/purchase/vo/PurchaseReturnDetailsVo.java b/src/main/java/com/ruoyi/purchase/vo/PurchaseReturnDetailsVo.java
index 02317e6..975cd5c 100644
--- a/src/main/java/com/ruoyi/purchase/vo/PurchaseReturnDetailsVo.java
+++ b/src/main/java/com/ruoyi/purchase/vo/PurchaseReturnDetailsVo.java
@@ -1,6 +1,6 @@
package com.ruoyi.purchase.vo;
-import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
+import com.ruoyi.purchase.dto.PurchaseReturnOrderHasAllInfoDto;
import com.ruoyi.sales.pojo.SalesLedgerProduct;
import lombok.AllArgsConstructor;
import lombok.Data;
@@ -20,7 +20,7 @@
@Data
@AllArgsConstructor
@NoArgsConstructor
-public class PurchaseReturnDetailsVo extends PurchaseReturnOrders implements Serializable {
+public class PurchaseReturnDetailsVo extends PurchaseReturnOrderHasAllInfoDto implements Serializable {
private List<PurchaseReturnOrderProductsDetailVo> purchaseReturnOrderProductsDetailVoList;
--
Gitblit v1.9.3