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

zss

8 天以前 c483ee040589c0063724059228e7e6c8e4ff943c

 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 {
    // 是否使用系统单号