Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventor...

huminmin

3 天以前 ee156a360b75a0e54d34a56a67930893c84d0eab

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

@@ -15,6 +15,8 @@
    // 采购合同号
    private String purchaseContractNumber;

    private String shippingTypeText;

    //退料人姓名
    private String returnUserName;