Merge remote-tracking branch 'origin/dev_New_pro' into dev_New_pro

云

2 天以前 3d556b8defe1ff5b9aeb481bd1d0a67b2ded0192

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

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

    private Long templateId;

    private String templateName;


}