From a966dafb8877552267a94fe8c544c5ea72cf5650 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期一, 16 六月 2025 09:44:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java | 11 +++++++----
1 files changed, 7 insertions(+), 4 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java
index 2668b19..e04b328 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java
@@ -35,14 +35,17 @@
@ApiModelProperty(value = "剩余周期人数")
private Integer cycleSurp;
-
+
@ApiModelProperty(value = "剩余体验人数")
private Integer explorationSurp;
-
+
@ApiModelProperty(value = "领券1开2关")
private Integer platformCouponFlag;
-
+
@ApiModelProperty(value = "生日卡1开2关")
private Integer platformBirthdayFlag;
-
+
+ @ApiModelProperty(value = "待处理预约单数量")
+ private Integer unHandleReserve;
+
}
--
Gitblit v1.7.1