From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/ChangeDispatch.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 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 d3e4f1a..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
@@ -50,6 +50,9 @@
@ApiModelProperty("改派状态 (0:未改派 ;1:已改派 ;2:拒绝)")
@TableField("state")
private Integer state;
+ @ApiModelProperty("订单类型(0:正常订单,1:后台订单(后台订单与用户端、师傅端无联系))")
+ @TableField("type")
+ private Integer type;
@ApiModelProperty("订单id")
@TableField("order_id")
@@ -76,4 +79,11 @@
@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