Merge remote-tracking branch 'origin/master'

puzhibing

2024-12-05 bf9395f1dab6d37c230d87ead0bef71757632be1

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

@@ -166,5 +166,9 @@
    @TableField("create_time")
    private LocalDateTime createTime;

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

}