Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

jenkins

2026-05-22 0e0ef19a7bd74b2fde0089c28ad3d61d0bc2d911

 src/main/java/com/ruoyi/sales/dto/ShippingInfoDto.java

@@ -8,6 +8,7 @@
import com.ruoyi.sales.pojo.ShippingProductDetail;
import lombok.Data;

import java.math.BigDecimal;
import java.util.List;

/**
@@ -40,6 +41,11 @@
    private List<Long> batchNo;
    private List<ShippingProductDetail> batchNoDetailList;

    //关联的出库单号
    private String outboundBatches;

    //发货数量
    private BigDecimal totalQuantity;


}