11.6

无关风月

2025-04-22 67f416634f95c81e618123b826e18a57ae08220d

 ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Order.java

@@ -10,7 +10,6 @@
import io.swagger.annotations.ApiModelProperty;
import lombok.Getter;
import lombok.Setter;
import org.springframework.format.annotation.DateTimeFormat;

import java.math.BigDecimal;
import java.util.Date;
@@ -80,11 +79,9 @@
    @TableField("reservation_address")
    private String reservationAddress;

    @ApiModelProperty("上门时间")
    @ApiModelProperty("上门时间段")
    @TableField("time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    @DateTimeFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date time;
    private String time;

    @ApiModelProperty("接单时间(师傅接单或后台派单，更新该字段时间)")
    @TableField("accept_time")
@@ -110,6 +107,11 @@
    @TableField("state")
    private Integer state;

    @ApiModelProperty("师傅到达预约地点时间")
    @TableField("arrive_time")
    @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
    private Date arriveTime;

    @ApiModelProperty("订单类型(0:正常订单,1:后台订单(后台订单与用户端、师傅端无联系))")
    @TableField("type")
    private Integer type;
@@ -134,6 +136,14 @@
    @TableField("is_withdrawal")
    private Integer isWithdrawal;

    @ApiModelProperty("详细地址")
    @TableField("address")
    private String address;

    @ApiModelProperty("订单取消原因")
    @TableField("cancel_reason")
    private String cancelReason;

    @ApiModelProperty("再投原因")
    @TableField(exist = false)
    private String applyReason;