Merge remote-tracking branch 'origin/2.0' into 2.0

huliguo

昨天 a966dafb8877552267a94fe8c544c5ea72cf5650

 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;
    
}