From b1c3cb31d1e8c250dd6817bd71ddfb3c785cb235 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期三, 18 六月 2025 13:54:01 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java |   13 +++++++++++--
 1 files changed, 11 insertions(+), 2 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 9b7fd78..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,8 +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