Merge branch 'dev_New_pro' into dev_天津_中兴实强

云

6 天以前 974b553211485da3634f8ff0e3ecb1eb61881e2d

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

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

    private Long templateId;

    private String templateName;


}