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

huanghongfa

2021-05-12 b9ee8fe325fa9746b284d3487df96d93d84d6473

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

@@ -182,8 +182,11 @@
        comPbActivityDO.setEnrollTimeBegin(now);
        comPbActivityDO.setCreateAt(now);

        //默认设置为“进行中”
        comPbActivityDO.setStatus(4);
        Integer status = partyBuildingActivityVO.getStatus();
        if(status!=null && status.intValue()==2) {//点击'保存并发布' 按钮
            //默认设置为“进行中”
            comPbActivityDO.setStatus(4);
        }

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