From 6e70ee2d0b73f70fe1140cc7d51c4e847d50aa51 Mon Sep 17 00:00:00 2001 From: xuhy <3313886187@qq.com> Date: 星期四, 17 四月 2025 10:54:26 +0800 Subject: [PATCH] 2.0迭代师傅订单列表 --- ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/ChangeDispatch.java | 20 +++++++++++++++++++- 1 files changed, 19 insertions(+), 1 deletions(-) diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/ChangeDispatch.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/ChangeDispatch.java index 9fde300..814b52e 100644 --- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/ChangeDispatch.java +++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/ChangeDispatch.java @@ -44,12 +44,15 @@ @ApiModelProperty("申请改派时间") @TableField("apply_time") - @JsonFormat(pattern = "yyyy-MM-dd HH:ss:mm") + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") private Date applyTime; @ApiModelProperty("改派状态 (0:未改派 ;1:已改派 ;2:拒绝)") @TableField("state") private Integer state; + @ApiModelProperty("订单类型(0:正常订单,1:后台订单(后台订单与用户端、师傅端无联系))") + @TableField("type") + private Integer type; @ApiModelProperty("订单id") @TableField("order_id") @@ -59,6 +62,11 @@ @TableField("order_number") private String orderNumber; + @ApiModelProperty("下单时间") + @TableField(exist = false) + @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss") + private Date orderTime; + @ApiModelProperty("下单用户id") @TableField("user_id") private Integer userId; @@ -67,5 +75,15 @@ @TableField("user_name") private String userName; + @ApiModelProperty("城市编码") + @TableField("city_code") + private String cityCode; + + @TableField(exist = false) + private String reservationName; + @TableField(exist = false) + private String reservationPhone; + @TableField(exist = false) + private String reservationAddress; } -- Gitblit v1.7.1