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

liding

2026-05-27 820e9e9e5e4ce7e8fb477ae8f2573dab1f2074de

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

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

    private Long templateId;

    private String templateName;


}