From 4010eccfd7a6e0f79041f9cb051c7f9d09bfdedc Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期二, 22 四月 2025 18:40:34 +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 | 7 +++++--
1 files changed, 5 insertions(+), 2 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 b03a4b2..138be89 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
@@ -61,6 +61,8 @@
@ApiModelProperty("打印次数")
@TableField("print_count")
private Integer printCount;
+ @TableField("msg_count")
+ private Integer msgCount;
@ApiModelProperty("回收服务名称")
@@ -112,7 +114,7 @@
@TableField("reservation_remark")
private String reservationRemark;
- @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，6:待改派)")
+ @ApiModelProperty("订单状态(0:待派单；1:待上门；2:待完工；3:已完结；4:已取消；5:已改派，7：待预约)")
@TableField("state")
private Integer state;
@@ -192,5 +194,6 @@
@ApiModelProperty("回收单凭证(多张照片 ','隔开)")
@TableField("paper_pic")
private String paperPic;
-
+ @ApiModelProperty("拉起确认收款页面参数")
+ private String packageInfo;
}
--
Gitblit v1.7.1