From 61b5f9863f14ab4fc9da504ca2b553a778eb2e2c Mon Sep 17 00:00:00 2001
From: 44323 <443237572@qq.com>
Date: 星期三, 24 一月 2024 15:10:32 +0800
Subject: [PATCH] Merge branch 'master' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang

---
 ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtPlTotalActivityTotalVo.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtPlTotalActivityTotalVo.java b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtPlTotalActivityTotalVo.java
index ddf8b54..3ca279b 100644
--- a/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtPlTotalActivityTotalVo.java
+++ b/ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtPlTotalActivityTotalVo.java
@@ -70,7 +70,6 @@
     private Integer[] orderTotalValue;
 
     @ApiModelProperty(value = "订单分布金额")
-    @JsonSerialize(using = ToStringSerializer.class)
     private BigDecimal[] orderMoneyValue;
 
     @ApiModelProperty(value = "销售占比数量")
@@ -82,10 +81,13 @@
     @ApiModelProperty(value = "店铺活动次数排行")
     private List<MgtMapIntTotalVo> activityRankList;
 
-    @ApiModelProperty(value = "店铺活动销售额排名")
-    private List<MgtMapBigTotalVo> shopSalesRankList;
+    @ApiModelProperty(value = "店铺活动销售额排名店铺名称")
+    private String[] shopSalesRankKey;
 
-    @ApiModelProperty(value = "店铺活动销售额排名")
+    @ApiModelProperty(value = "店铺活动销售额排名金额")
+    private BigDecimal[] shopSalesRankValue;
+
+    @ApiModelProperty(value = "店铺活动分类销售额排名")
     private List<MgtMapBigTotalVo> activitySalesRankList;
 
     /*@ApiModelProperty(value = "活动年龄分布key")

--
Gitblit v1.7.1