Merge branch 'dev_New_pro' into dev_平遥县盛达铸造厂

gongchunyi

2026-07-07 72a32c227fdf10f34fe563a7de35169da5729eea

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

@@ -17,6 +17,11 @@

    private String shippingTypeText;

    /**
     * 对应出库是否已审核通过
     */
    private Boolean stockOutApproved;

    //退料人姓名
    private String returnUserName;