From 8444084e6aa11efa23287e7f82474ac22378a5c4 Mon Sep 17 00:00:00 2001 From: Pu Zhibing <393733352@qq.com> Date: 星期二, 01 四月 2025 16:03:19 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- ruoyi-modules/ruoyi-order/src/main/java/com/ruoyi/order/domain/vo/MgtPlTotalActivityTotalVo.java | 9 ++++++--- 1 files changed, 6 insertions(+), 3 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 b442666..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 @@ -81,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