From 9411a5a1eec19f3460eca9a6c82ebb46dc4e2f0d Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 26 六月 2025 20:06:58 +0800
Subject: [PATCH] 大屏接口bug修改

---
 ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/Order.java |   12 ++++++++++--
 1 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/Order.java b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/Order.java
index 21edc24..4d5ee1e 100644
--- a/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/Order.java
+++ b/ruoyi-service/ruoyi-user/src/main/java/com/ruoyi/user/entity/Order.java
@@ -30,6 +30,10 @@
     @TableId(value = "id",type = IdType.AUTO)
     private Integer id;
 
+    @ApiModelProperty("下单城市")
+    @TableField("city")
+    private String city;
+
     @ApiModelProperty("订单编号")
     @TableField("order_number")
     private String orderNumber;
@@ -72,7 +76,7 @@
 
     @ApiModelProperty("上门时间")
     @TableField("time")
-    private Date time;
+    private String time;
 
     @ApiModelProperty("服务人员id")
     @TableField("server_id")
@@ -122,7 +126,7 @@
     @TableField("complete_time")
     private Date completeTime;
 
-    @ApiModelProperty("是否已提现(0:未提现,1:已提现)")
+    @ApiModelProperty("是否已提现(0:未提现,1:审核中 2审核通过 3:已确认收款)")
     @TableField("is_withdrawal")
     private Integer isWithdrawal;
 
@@ -134,4 +138,8 @@
     @TableField("address")
     private String address;
 
+    @ApiModelProperty("订单取消原因")
+    @TableField("cancel_reason")
+    private String cancelReason;
+
 }

--
Gitblit v1.7.1