From 9283fa6e32145ff0ae237c40d2008fc35e81ef7c Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 09 六月 2025 10:29:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Order.java | 10 ++++++++++
1 files changed, 10 insertions(+), 0 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Order.java b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Order.java
index 36a4f10..adf824a 100644
--- a/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Order.java
+++ b/ruoyi-api/ruoyi-api-admin/src/main/java/com/ruoyi/admin/api/entity/Order.java
@@ -27,6 +27,16 @@
@TableId("id")
private Integer id;
+ @ApiModelProperty("师傅填写备注")
+ @TableField("remark")
+ private String remark;
+ @ApiModelProperty("下单城市")
+ @TableField("city")
+ private String city;
+
+ @ApiModelProperty("订单编号")
+ @TableField("order_number")
+ private String orderNumber;
@ApiModelProperty("站点id")
@TableField("site_id")
--
Gitblit v1.7.1