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

云

2026-05-30 16338016e73791cecbbdbdd73e972b29a06c59b1

 src/main/java/com/ruoyi/sales/pojo/ShippingInfo.java

@@ -28,6 +28,10 @@
    @Excel(name = "客户名称")
    private String customerName;

    @TableField(exist = false)
    @Schema(description = "客户id")
    private Long customerId;

    @TableId(value = "id", type = IdType.AUTO)
    private Long id;