Merge remote-tracking branch 'origin/dev_天津_意博凯信' into dev_天津_意博凯信

gongchunyi

2026-08-12 c7ef427794795bddb10585eda2c5e43f0c2970bc

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

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

    private Long templateId;

    private String templateName;


}