From 7e92d9c7f76777c48f76376c99ffaae2e16fe7ed Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 01 七月 2025 14:37:08 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/ChangeDispatch.java | 18 +++++++++++++++++-
1 files changed, 17 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/ChangeDispatch.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/ChangeDispatch.java
index 3885df0..148ed4c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/ChangeDispatch.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/ChangeDispatch.java
@@ -44,16 +44,22 @@
@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("订单id")
@TableField("order_id")
private String orderId;
+
+ @ApiModelProperty("下单时间")
+ @TableField(exist = false)
+ @JsonFormat(pattern = "yyyy-MM-dd HH:mm:ss")
+ private Date orderTime;
@ApiModelProperty("订单编号")
@TableField("order_number")
@@ -67,5 +73,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