Merge branch 'hemenkou_dev' into dev

101captain

2022-03-09 9c5b811fb700bc66e66dbf38ed8733e57a4edac6

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/api/ComActSocialProjectApi.java

@@ -72,6 +72,11 @@
        ComActSocialProject comActSocialProject=new ComActSocialProject();
        BeanUtils.copyProperties(socialProjectVO,comActSocialProject);
        comActSocialProject.setCreateTime(new Date());
        if(socialProjectVO.getLevel()>1){
            ComActSocialProject comActSocialProject1=comActSocialProjectService.getById(socialProjectVO.getParentId());
            comActSocialProject.setColumnId(comActSocialProject1.getColumnId());
            comActSocialProject.setSecondColumnId(comActSocialProject1.getSecondColumnId());
        }
        return R.ok(this.comActSocialProjectService.save(comActSocialProject));
    }