Merge branch 'cedoodev' into test

CeDo

2021-05-21 1afc898184d26255d00313ef380b5a6df7940fa8

 springcloud_k8s_panzhihuazhihuishequ/service_partybuilding/src/main/java/com/panzhihua/service_dangjian/service/impl/ComBpActivityServiceImpl.java

@@ -521,6 +521,9 @@
            comPbActivityMemberDO.setMemberId(comPbMemberDOId);
            comPbActivityMemberDO.setActivityId(comPbActivityDO1Id);
            comPbActivityMemberDO.setCreateAt(new Date());
            comPbActivityMemberDO.setUserId(comPbActivityDTO.getCreateBy());
            comPbActivityMemberDO.setName(comPbMemberDO.getName());
            comPbActivityMemberDO.setPhotoPath(comPbMemberDO.getPhotoPath());
            comPbActivityMemberDAO.insert(comPbActivityMemberDO);
            return R.ok();
        }