Merge branch 'dev_New_pro' into dev_新疆马铃薯pro

云

2026-05-30 16338016e73791cecbbdbdd73e972b29a06c59b1

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

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

    //采购合同号
    private String purchaseContractNumber;

    private Long templateId;

    private String templateName;


}