luodangjia
2025-01-08 d34b3987a7c89c29a74eb7d3525b2a486eeaca10
ruoyi-service/ruoyi-admin/src/main/java/com/ruoyi/admin/entity/Order.java
@@ -4,6 +4,7 @@
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableId;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.ruoyi.common.core.domain.BaseEntity;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
@@ -78,9 +79,9 @@
    @TableField("reservation_address")
    private String reservationAddress;
    @ApiModelProperty("上门时间")
    @ApiModelProperty("上门时间段")
    @TableField("time")
    private Date time;
    private String time;
    @ApiModelProperty("接单时间(师傅接单或后台派单,更新该字段时间)")
    @TableField("accept_time")
@@ -106,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;
@@ -130,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;