Merge branch 'hemenkou_dev' into dev

101captain

2022-03-11 a1e2af86c95771262232ad7120b048721c0b2d1d

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

@@ -305,6 +305,7 @@
                    comActActRegistVOS.forEach(activitySignInVO -> {
                        if (comActActivityVO.getId().equals(activitySignInVO.getActivityId())) {
                            currentList.add(activitySignInVO);
                            comActActivityVO.setIsComment(1);
                        }
                    });
                    if (currentList.size() > 10) {