Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

 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;

}