From c5d38d650d2ac4101b1293a4f17346e7d5420076 Mon Sep 17 00:00:00 2001
From: huliguo <2023611923@qq.com>
Date: 星期五, 04 七月 2025 20:39:58 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/2.0' into 2.0
---
ruoyi-modules/ruoyi-shop/src/main/java/com/ruoyi/shop/domain/vo/MgtPlTotalShopTotalVo.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 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..8e19943 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,9 +1,10 @@
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;
+import java.math.BigDecimal;
import java.util.List;
/**
@@ -44,20 +45,20 @@
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;
@ApiModelProperty(value = "合作商营业额value")
- private Integer[] shopSalesRankValue;
+ private BigDecimal[] shopSalesRankValue;
@ApiModelProperty(value = "合作商推荐")
- private List<MgtMapTotalVo> shopRecommendVos;
+ private List<MgtMapIntTotalVo> shopRecommendVos;
}
--
Gitblit v1.7.1