From 0c569ab4b38d972213eeaf7e8965f33f8ec650fd Mon Sep 17 00:00:00 2001
From: luodangjia <luodangjia>
Date: 星期二, 05 十一月 2024 11:19:19 +0800
Subject: [PATCH] 11.5
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/ChangeDispatch.java | 13 ++++++++++++-
1 files changed, 12 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..44b437c 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,8 @@
@TableField("user_name")
private String userName;
+ @ApiModelProperty("城市编码")
+ @TableField("city_code")
+ private String cityCode;
}
--
Gitblit v1.7.1