From 284bb7da704a333ef92e32610107e95749a3e0b0 Mon Sep 17 00:00:00 2001
From: 张天森 <1292933220@qq.com>
Date: 星期三, 13 七月 2022 15:12:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/huacheng_test' into huacheng
---
springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/IndexDataAnalysisVO.java | 82 ++++++++++++++++++++---------------------
1 files changed, 40 insertions(+), 42 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/IndexDataAnalysisVO.java b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/IndexDataAnalysisVO.java
index 8849703..573bc2c 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/IndexDataAnalysisVO.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/user/IndexDataAnalysisVO.java
@@ -15,12 +15,6 @@
@ApiModelProperty("用户总数")
private Integer allUser;
- @ApiModelProperty("实名用户总数")
- private Integer realUser;
-
- @ApiModelProperty("实名用户占比")
- private Double realUserRate;
-
@ApiModelProperty("新增用户")
private Integer addUser;
@@ -30,42 +24,46 @@
@ApiModelProperty("周活跃用户")
private Integer activeWeekUser;
- @ApiModelProperty("其他用户数(按街道，社区划分时使用)")
- private Integer otherUser;
-
- @ApiModelProperty("其他用户占比(按街道，社区划分时使用)")
- private Double otherUserRate;
-
- @ApiModelProperty("用户占比（累计）")
- private List<UserProportion> userProportionTotal;
-
- @ApiModelProperty("用户占比（本月）")
- private List<UserProportion> userProportionMonth;
-
- @ApiModelProperty("实名用户（累计）")
- private List<RealUser> realUsersTotal;
-
- @ApiModelProperty("实名用户（本月）")
- private List<RealUser> realUsersMonth;
-
- @ApiModelProperty("用户行为X轴(累计过去20天)")
- private List<Date> userActivityXAll;
-
- @ApiModelProperty("用户行为X轴（本月）")
- private List<Date> userActivityXMonth;
-
- @ApiModelProperty("新增用户Y轴(累计过去20天)")
- private List<String> addUserYAll;
-
- @ApiModelProperty("新增用户Y轴（本月）")
- private List<String> addUserYWeek;
-
- @ApiModelProperty("日活用户Y轴（累计过去20天）")
- private List<String> activeUserYAll;
-
- @ApiModelProperty("日活用户Y轴（本月）")
- private List<String> activeUserYMonth;
-
+// @ApiModelProperty("其他用户数(按街道，社区划分时使用)")
+// private Integer otherUser;
+//
+// @ApiModelProperty("其他用户占比(按街道，社区划分时使用)")
+// private Double otherUserRate;
+//
+// @ApiModelProperty("用户占比（累计）")
+// private List<UserProportion> userProportionTotal;
+//
+// @ApiModelProperty("用户占比（本月）")
+// private List<UserProportion> userProportionMonth;
+//
+// @ApiModelProperty("实名用户（累计）")
+// private List<RealUser> realUsersTotal;
+//
+// @ApiModelProperty("实名用户（本月）")
+// private List<RealUser> realUsersMonth;
+//
+// @ApiModelProperty("用户行为X轴(累计过去20天)")
+// private List<String> userActivityXAll;
+//
+// @ApiModelProperty("用户行为X轴（本月）")
+// private List<String> userActivityXMonth;
+//
+// @ApiModelProperty("新增用户Y轴(累计过去20天)")
+// private List<String> addUserYAll;
+//
+// @ApiModelProperty("新增用户Y轴（本月）")
+// private List<String> addUserYWeek;
+//
+// @ApiModelProperty("日活用户Y轴（累计过去20天）")
+// private List<String> activeUserYAll;
+//
+// @ApiModelProperty("日活用户Y轴（本月）")
+// private List<String> activeUserYMonth;
+// @ApiModelProperty("实名用户总数")
+// private Integer realUser;
+//
+// @ApiModelProperty("实名用户占比")
+// private Double realUserRate;
--
Gitblit v1.7.1