From a322c60e5fa8c4c7fc86ad24153d29592c3b8b05 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期四, 17 四月 2025 11:51:36 +0800
Subject: [PATCH] Merge branch 'dev' of http://120.76.84.145:10101/gitblit/r/java/JiaDianHuiShou into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
index 5c1c32e..4be2b7c 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/entity/Order.java
@@ -117,7 +117,7 @@
@TableField("reservation_remark")
private String reservationRemark;
- @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，6:待改派)")
+ @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，6:待改派，7：待预约)")
@TableField("state")
private Integer state;
@@ -147,7 +147,7 @@
@TableField("subsidy")
private BigDecimal subsidy;
- @ApiModelProperty("是否已提现(0:未提现，1:已提现)")
+ @ApiModelProperty("是否已提现(0:未提现，1:审核中 2审核通过 3:已确认收款)")
@TableField("is_withdrawal")
private Integer isWithdrawal;
--
Gitblit v1.7.1