Merge remote-tracking branch 'origin/master'

Pu Zhibing

2024-12-05 940dd1b292db4c5cc2df2f137fa46c37f2159898

 ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/model/Order.java

@@ -165,6 +165,10 @@
    @ApiModelProperty(value = "添加时间")
    @TableField("create_time")
    private LocalDateTime createTime;

    
    @ApiModelProperty(value = "预计提货时间")
    @TableField("expected_delivery_time")
    private String expectedDeliveryTime;
    

}