Merge branch 'local_20221104' into huacheng_test

yanghui

2022-11-17 6e907cce72e42a349123800d697aa99f3360783e

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/service/impl/ComActProceedingsServiceImpl.java

@@ -48,6 +48,7 @@
            comActProceedings.setCreateTime(new Date());
            comActProceedings.setDelFlag(0);
            comActProceedings.setStatus(0);
            BeanUtils.copyProperties(comActProceedingsDTO, comActProceedings);
            int i = comActProceedingsDao.insert(comActProceedings);
            if (i>0){
                return R.ok();