Merge remote-tracking branch 'origin/dev_新疆马铃薯pro' into dev_新疆马铃薯pro

liding

2026-06-01 49c3ba90feb4f14fb2f0c911aadeb865bb07f26f

 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;


}