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

liyong

4 天以前 dbd7fd484b5c7ed00cb895f227645848c3677c08

 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;