Merge branch 'huacheng_test' into huacheng

101captain

2022-06-17 871972f549897b9cf3d9bd9da8ebfc897dc9fb1a

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

@@ -339,7 +339,7 @@
                    Integer limit = comActActivityVO.getLimit();
                    if(limit != null && limit>0 &&currentList.size()>0){
                        if(comActActivityVO.getType()==3){
                            if(limit==currentList.size()||currentList.get(currentList.size()-1).getEndTime()!=null){
                            if(limit==currentList.size()&&currentList.get(currentList.size()-1).getEndTime()!=null){
                                comActActivityVO.setIsRegist(1);
                            }
                        }