From 431dde90aa20f7652092fc0bfa9e6a1a28b06b9f Mon Sep 17 00:00:00 2001
From: jiangqs <343695869@qq.com>
Date: 星期日, 06 八月 2023 12:41:23 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

---
 ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MgtPlTotalMemberTotalVo.java |   17 ++++++++++-------
 1 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MgtPlTotalMemberTotalVo.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MgtPlTotalMemberTotalVo.java
index 3d09306..e693c0a 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MgtPlTotalMemberTotalVo.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/vo/MgtPlTotalMemberTotalVo.java
@@ -37,25 +37,28 @@
     private Integer[] ageValue;
 
     @ApiModelProperty(value = "会员调理")
-    private List<MgtMapTotalVo> nurseTotalVos;
+    private List<MgtMapIntTotalVo> nurseTotalVos;
+
+    @ApiModelProperty(value = "会员等级")
+    private List<MgtMapIntTotalVo> memberLevelTotalVos;
 
     @ApiModelProperty(value = "商品类型")
-    private List<MgtMapTotalVo> goodsTypeTotalVos;
+    private List<MgtMapIntTotalVo> goodsTypeTotalVos;
 
     @ApiModelProperty(value = "活跃度")
-    private List<MgtMapTotalVo> activenessList;
+    private List<MgtMapIntTotalVo> activenessList;
 
     @ApiModelProperty(value = "来源渠道")
-    private List<MgtMapTotalVo> customerSourceList;
+    private List<MgtMapIntTotalVo> customerSourceList;
 
     @ApiModelProperty(value = "消费排行")
-    private List<MgtMapTotalVo> memberPayList;
+    private List<MgtMapIntTotalVo> memberPayList;
 
     @ApiModelProperty(value = "商品排行")
-    private List<MgtMapTotalVo> memberGoodsRankList;
+    private List<MgtMapIntTotalVo> memberGoodsRankList;
 
     @ApiModelProperty(value = "店铺会员")
-    private List<MgtMapTotalVo> shopMemberRankList;
+    private List<MgtMapIntTotalVo> shopMemberRankList;
 
 
 }

--
Gitblit v1.7.1