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

liyong

5 天以前 4635770544e2d57416ad88a8983ee293919f5fec

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

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

    private Long templateId;

    private String templateName;


}