From af6456c60aa0d3cc931d3c85f652fa7e47d003e3 Mon Sep 17 00:00:00 2001
From: Pu Zhibing <393733352@qq.com>
Date: 星期一, 23 六月 2025 11:11:02 +0800
Subject: [PATCH] Merge branch '2.0' of http://120.76.84.145:10101/gitblit/r/java/HongRuiTang into 2.0
---
ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtTotalMemberTotalVo.java | 22 ++++++++++++++++------
1 files changed, 16 insertions(+), 6 deletions(-)
diff --git a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtTotalMemberTotalVo.java b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtTotalMemberTotalVo.java
index 8507f0c..adb11c2 100644
--- a/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtTotalMemberTotalVo.java
+++ b/ruoyi-modules/ruoyi-member/src/main/java/com/ruoyi/member/domain/vo/MgtTotalMemberTotalVo.java
@@ -1,9 +1,10 @@
package com.ruoyi.member.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;
/**
@@ -40,8 +41,14 @@
@ApiModelProperty(value = "男人")
private Integer manTotal;
+ @ApiModelProperty(value = "男人比例")
+ private BigDecimal manPercent;
+
@ApiModelProperty(value = "女人")
private Integer womenTotal;
+
+ @ApiModelProperty(value = "女人比例")
+ private BigDecimal womenPercent;
@ApiModelProperty(value = "会员年龄key")
private String[] ageKey;
@@ -50,17 +57,20 @@
private Integer[] ageValue;
@ApiModelProperty(value = "会员调理")
- private List<MgtMapTotalVo> nurseTotalVos;
+ private List<MgtMapIntTotalVo> nurseTotalVos;
+
+ @ApiModelProperty(value = "会员等级")
+ private List<MgtMapIntTotalVo> memberLevelTotalVos;
@ApiModelProperty(value = "商品类型")
- private List<MgtMapTotalVo> goodsTypeTotalVos;
+ private List<MgtMapIntTotalVo> goodsTypeTotalVos;
@ApiModelProperty(value = "活跃度")
- private List<MgtMapTotalVo> activenessList;
+ private List<MgtMapIntTotalVo> activenessList;
@ApiModelProperty(value = "来源渠道")
- private List<MgtMapTotalVo> customerSourceList;
+ private List<MgtMapIntTotalVo> customerSourceList;
@ApiModelProperty(value = "消费排行")
- private List<MgtMapTotalVo> memberPayList;
+ private List<MgtMapIntTotalVo> memberPayList;
}
--
Gitblit v1.7.1