Merge branch 'master' of http://gitlab.nhys.cdnhxx.com/root/zhihuishequ

huanghongfa

2021-02-02 8d838dc3b52e2daacb45906ef1831a2f4aedf390

 springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java

@@ -214,7 +214,8 @@
            comActActivityVOS=collect;
        }
        if (!ObjectUtils.isEmpty(comActActivityVOS)) {
//            comActActivityVOS.stream().sorted(Comparator.comparing(ComActActivityVO::getSingDate).reversed()).collect(Collectors.toList());
            List<ComActActivityVO> collect = comActActivityVOS.stream().sorted(Comparator.comparing(ComActActivityVO::getSingDate).reversed()).collect(Collectors.toList());
            return R.ok(collect);
        }
        return R.ok(comActActivityVOS);
    }