Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2026-04-23 a1b154bfd4c5e138d964e1bfdc5a2bcac1e25488

 src/main/java/com/ruoyi/purchase/dto/PurchaseReturnOrderDto.java

@@ -1,11 +1,12 @@
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 {
    // 是否使用系统单号
@@ -14,4 +15,6 @@
    private String supplierName;

    private List<PurchaseReturnOrderProductsDto> purchaseReturnOrderProductsDtos;

    private Long[] deptIds;
}