Merge remote-tracking branch 'origin/master'

CBin

2023-08-02 88b0f7ea048e9b201af0bc390f3da8840b11c899

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/dto/MerMemberPageDto.java

@@ -38,9 +38,15 @@
    @ApiModelProperty(value = "用户标签")
    private String memberTag;

    @ApiModelProperty(value = "剩余次数")
    @ApiModelProperty(value = "剩余次数1.5次以下2.5-10次3.10次以上")
    private Integer surpNum;

    @ApiModelProperty(value = "剩余次数")
    private Integer surpStartNum;

    @ApiModelProperty(value = "剩余次数")
    private Integer surpEndNum;

    @ApiModelProperty(value = "会员等级")
    private String memberLevel;