Merge branch 'dev_New_pro' into dev_New_pro_玉山机械

buhuazhen

2026-05-28 08553c034773008ba68b7b6709683b385610ee4f

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

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

    private Long templateId;

    private String templateName;


}