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/OrderPageCountVO.java | 6 +++++-
1 files changed, 5 insertions(+), 1 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderPageCountVO.java b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderPageCountVO.java
index e44da29..0308644 100644
--- a/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderPageCountVO.java
+++ b/ruoyi-api/ruoyi-api-order/src/main/java/com/ruoyi/order/api/entity/OrderPageCountVO.java
@@ -32,11 +32,14 @@
@ApiModelProperty("再投订单")
private Integer reInvestment;
+ @ApiModelProperty("待预约数量")
+ private Integer pending;
+
public OrderPageCountVO() {
}
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;
@@ -44,5 +47,6 @@
this.completed = completed;
this.canceled = canceled;
this.reInvestment = reInvestment;
+ this.pending = pending;
}
}
--
Gitblit v1.7.1