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-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java
index 138be89..314e5c4 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/Order.java
@@ -34,6 +34,9 @@
     @ApiModelProperty("下单城市")
     @TableField("city")
     private String city;
+    @ApiModelProperty("师傅填写备注")
+    @TableField("remark")
+    private String remark;
     @TableField("province_code")
     private String provinceCode;
     @TableField("are_code")

--
Gitblit v1.7.1