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 | 7 +++++++
1 files changed, 7 insertions(+), 0 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 be164fb..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
@@ -51,6 +51,7 @@
@TableField("state")
private Integer state;
+
@ApiModelProperty("订单id")
@TableField("order_id")
private String orderId;
@@ -75,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