From 3ca15fea872010606b5b96a4c11d0d6409dd0be7 Mon Sep 17 00:00:00 2001 From: jiangqs <jiangqs> Date: 星期一, 18 九月 2023 18:09:05 +0800 Subject: [PATCH] Merge branch 'master' of ssh://120.76.84.145:20202/java/HongRuiTang into master --- ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MerHomeShopTotalVo.java | 6 ++++++ 1 files changed, 6 insertions(+), 0 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..2668b19 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 @@ -39,4 +39,10 @@ @ApiModelProperty(value = "剩余体验人数") private Integer explorationSurp; + @ApiModelProperty(value = "领券1开2关") + private Integer platformCouponFlag; + + @ApiModelProperty(value = "生日卡1开2关") + private Integer platformBirthdayFlag; + } -- Gitblit v1.7.1