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/MgtPlTotalMemberTotalVo.java

@@ -39,6 +39,9 @@
    @ApiModelProperty(value = "会员调理")
    private List<MgtMapIntTotalVo> nurseTotalVos;

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

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