From 9359774f3f5d9d57ee37cbe67b175c25ed825859 Mon Sep 17 00:00:00 2001
From: yanghui <2536613402@qq.com>
Date: 星期一, 17 十月 2022 11:57:40 +0800
Subject: [PATCH] Merge branch 'local_20221014' into huacheng_test
---
springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
index b36910f..eecc18e 100644
--- a/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
+++ b/springcloud_k8s_panzhihuazhihuishequ/service_user/src/main/java/com/panzhihua/service_user/service/impl/UserServiceImpl.java
@@ -3568,8 +3568,8 @@
for (Date date : activeDate) {
String dateStr = DateUtil.format(date, "yyyy-MM-dd");
- activeY.add(activeMap.containsKey(dateStr) ? activeMap.get("activeUser").toString() : "0");
- adY.add(dailyAddMap.containsKey(dateStr) ? dailyAddMap.get("addUser").toString() : "0");
+ activeY.add(activeMap.containsKey(dateStr) ? activeMap.get(dateStr) : "0");
+ adY.add(dailyAddMap.containsKey(dateStr) ? dailyAddMap.get(dateStr) : "0");
}
vo.setUserX(getMAndD(activeDate));
--
Gitblit v1.7.1