Merge branch 'master' into 'test'

罗yu 元桥

2021-04-28 b6082fe75b377ac9c177736d98f36ae46e7cdb70

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

@@ -178,7 +178,13 @@
    public R addactivity(PartyBuildingActivityVO partyBuildingActivityVO) {
        ComPbActivityDO comPbActivityDO = new ComPbActivityDO();
        BeanUtils.copyProperties(partyBuildingActivityVO, comPbActivityDO);
        comPbActivityDO.setCreateAt(new Date());
        Date now = new Date();
        comPbActivityDO.setEnrollTimeBegin(now);
        comPbActivityDO.setCreateAt(now);

        //默认设置为“进行中”
        comPbActivityDO.setStatus(4);

        int insert = comBpActivityDAO.insert(comPbActivityDO);
        if (insert > 0) {
            return R.ok();