From 1668fe1b912d07191c9fd7f20808d7d2162bc8e8 Mon Sep 17 00:00:00 2001
From: 无关风月 <443237572@qq.com>
Date: 星期一, 21 四月 2025 17:09:53 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageCountVO.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageCountVO.java b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageCountVO.java
index 33d1a4e..1f9ea00 100644
--- a/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageCountVO.java
+++ b/ruoyi-service/ruoyi-order/src/main/java/com/ruoyi/order/vo/OrderPageCountVO.java
@@ -31,9 +31,11 @@
@ApiModelProperty("再投订单")
private Integer reInvestment;
+ @ApiModelProperty("待预约数量")
+ private Integer pending;
public OrderPageCountVO(Integer total, Integer toBeDispatched, Integer stayDoorstep, Integer toBeCompleted,
- Integer completed, Integer canceled, Integer reInvestment) {
+ Integer completed, Integer canceled, Integer reInvestment,Integer pending) {
this.total = total;
this.toBeDispatched = toBeDispatched;
this.stayDoorstep = stayDoorstep;
@@ -41,5 +43,6 @@
this.completed = completed;
this.canceled = canceled;
this.reInvestment = reInvestment;
+ this.pending = pending;
}
}
--
Gitblit v1.7.1