From 88b0f7ea048e9b201af0bc390f3da8840b11c899 Mon Sep 17 00:00:00 2001
From: CBin <497303054@qq.com>
Date: 星期三, 02 八月 2023 21:13:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtPlTotalShopTotalVo.java | 10 +++++-----
1 files changed, 5 insertions(+), 5 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 3b89317..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,6 +1,6 @@
package com.ruoyi.shop.domain.vo;
-import com.ruoyi.system.api.domain.vo.MgtMapTotalVo;
+import com.ruoyi.system.api.domain.vo.MgtMapIntTotalVo;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -44,13 +44,13 @@
private Integer[] ageValue;
@ApiModelProperty(value = "合作商类型")
- private List<MgtMapTotalVo> shopTypeVos;
+ private List<MgtMapIntTotalVo> shopTypeVos;
@ApiModelProperty(value = "区域商户排行")
- private List<MgtMapTotalVo> areaRankVos;
+ private List<MgtMapIntTotalVo> areaRankVos;
@ApiModelProperty(value = "合作商状态")
- private List<MgtMapTotalVo> shopStatusVos;
+ private List<MgtMapIntTotalVo> shopStatusVos;
@ApiModelProperty(value = "合作商营业额key")
private String[] shopSalesRankKey;
@@ -59,5 +59,5 @@
private Integer[] shopSalesRankValue;
@ApiModelProperty(value = "合作商推荐")
- private List<MgtMapTotalVo> shopRecommendVos;
+ private List<MgtMapIntTotalVo> shopRecommendVos;
}
--
Gitblit v1.7.1