Merge branch 'refs/heads/dev_New_pro' into dev_宁夏_英泽防锈

云

7 小时以前 620bb4712a31791231c4381581f0f60088f079fe

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

@@ -47,5 +47,9 @@
    //发货数量
    private BigDecimal totalQuantity;

    private Long templateId;

    private String templateName;


}