Merge remote-tracking branch 'origin/dev' into dev

101captain

2022-03-28 3e3786c894fda81b6a3415bee6023c671ef1580e

Merge remote-tracking branch 'origin/dev' into dev

# Conflicts:
#	springcloud_k8s_panzhihuazhihuishequ/applets/src/main/java/com/panzhihua/applets/api/UserApi.java

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

@@ -336,14 +336,15 @@
                    } else {
                        comActActivityVO.setActivitySignInList(currentList);
                    }
                    if(comActActivityVO.getLimit()>0&&currentList.size()>0){
                    Integer limit = comActActivityVO.getLimit();
                    if(limit != null && limit>0 &&currentList.size()>0){
                        if(comActActivityVO.getType()==3){
                            if(comActActivityVO.getLimit()==currentList.size()&&currentList.get(currentList.size()-1).getEndTime()!=null){
                            if(limit==currentList.size()&&currentList.get(currentList.size()-1).getEndTime()!=null){
                                comActActivityVO.setIsRegist(1);
                            }
                        }
                        else {
                            if(comActActivityVO.getLimit()==currentList.size()){
                            if(limit==currentList.size()){
                                comActActivityVO.setIsRegist(1);
                            }
                        }