Merge branch 'local_20221014' into huacheng_test

yanghui

2022-10-17 9359774f3f5d9d57ee37cbe67b175c25ed825859

Merge branch 'local_20221014' into huacheng_test

 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));