From cbc564a7088503ad8cc7af4e1d2ba417d061e615 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期五, 30 六月 2023 11:35:05 +0800
Subject: [PATCH] 联调bug和统计完善

---
 ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtPlTotalShopTotalVo.java |   31 +++++++++++--------------------
 1 files changed, 11 insertions(+), 20 deletions(-)

diff --git a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtPlTotalShopTotalVo.java b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtPlTotalShopTotalVo.java
index ef852a6..e55d288 100644
--- a/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtPlTotalShopTotalVo.java
+++ b/ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtPlTotalShopTotalVo.java
@@ -1,7 +1,10 @@
 package com.ruoyi.shop.domain.vo;
 
+import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
 import io.swagger.annotations.ApiModelProperty;
 import lombok.Data;
+
+import java.util.List;
 
 /**
  * @ClassName MgtTotalShopTotalVo
@@ -40,23 +43,14 @@
     @ApiModelProperty(value = "会员年龄value")
     private Integer[] ageValue;
 
-    @ApiModelProperty(value = "合作商类型key")
-    private String[] shopTypeKey;
+    @ApiModelProperty(value = "合作商类型")
+    private List<MgtMapIntTotalVo> shopTypeVos;
 
-    @ApiModelProperty(value = "合作商类型value")
-    private Integer[] shopTypeValue;
+    @ApiModelProperty(value = "区域商户排行")
+    private List<MgtMapIntTotalVo> areaRankVos;
 
-    @ApiModelProperty(value = "区域商户排行key")
-    private String[] areaRankKey;
-
-    @ApiModelProperty(value = "区域商户排行value")
-    private Integer[] areaRankValue;
-
-    @ApiModelProperty(value = "合作商状态key")
-    private String[] shopStatusKey;
-
-    @ApiModelProperty(value = "合作商状态value")
-    private Integer[] shopStatusValue;
+    @ApiModelProperty(value = "合作商状态")
+    private List<MgtMapIntTotalVo> shopStatusVos;
 
     @ApiModelProperty(value = "合作商营业额key")
     private String[] shopSalesRankKey;
@@ -64,9 +58,6 @@
     @ApiModelProperty(value = "合作商营业额value")
     private Integer[] shopSalesRankValue;
 
-    @ApiModelProperty(value = "合作商推荐key")
-    private String[] shopRecommendKey;
-
-    @ApiModelProperty(value = "合作商推荐value")
-    private Integer[] shopRecommendValue;
+    @ApiModelProperty(value = "合作商推荐")
+    private List<MgtMapIntTotalVo> shopRecommendVos;
 }

--
Gitblit v1.7.1