Merge remote-tracking branch 'origin/master'

puzhibing

2024-03-18 945561a655919045c3086f00d7d16dbc1d24c23f

 ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MerMemberFixedTotalVo.java

@@ -35,9 +35,15 @@
    @ApiModelProperty(value = "会员年龄value")
    private Integer[] ageValue;

    @ApiModelProperty(value = "会员年龄占比value")
    private BigDecimal[] agePercentValue;

    @ApiModelProperty(value = "会员调理")
    private List<MgtMapIntTotalVo> nurseTotalVos;

    @ApiModelProperty(value = "会员等级")
    private List<MgtMapIntTotalVo> memberLevelTotalVos;

    @ApiModelProperty(value = "商品类型")
    private List<MgtMapIntTotalVo> goodsTypeTotalVos;