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

云

7 天以前 66c6ab9883ecb5e0595f02fec6b66e962d1fbf67

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

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

    private Long templateId;

    private String templateName;


}