Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-06 e1fd9c69d375b691d83d08f3411124bc3a051a00

 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;
    

}