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

zss

8 天以前 72fc7715866a96cb7c587eb36af112730e7d12c2

 src/main/java/com/ruoyi/purchase/vo/PurchaseReturnOrderVo.java

@@ -1,7 +1,13 @@
package com.ruoyi.purchase.vo;

import com.ruoyi.purchase.pojo.PurchaseReturnOrders;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;

@Data
@AllArgsConstructor
@NoArgsConstructor
public class PurchaseReturnOrderVo extends PurchaseReturnOrders {
    //供应商名称
    private String supplierName;