From d90ac211d9168c1ce8d390838f367a0db00afb52 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 03 六月 2025 14:37:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/ChangeDispatch.java | 10 +++++++---
1 files changed, 7 insertions(+), 3 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 799ae47..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
@@ -50,9 +50,7 @@
@ApiModelProperty("改派状态 (0:未改派 ;1:已改派 ;2:拒绝)")
@TableField("state")
private Integer state;
- @ApiModelProperty("订单类型(0:正常订单,1:后台订单(后台订单与用户端、师傅端无联系))")
- @TableField("type")
- private Integer type;
+
@ApiModelProperty("订单id")
@TableField("order_id")
@@ -78,6 +76,12 @@
@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