Merge branch 'huacheng_test' into local_20221104

yanghui

2022-11-04 06180fa3c8ee17d731561b88897fa18b9f8cf228

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

@@ -69,7 +69,7 @@
        if (!ObjectUtils.isEmpty(records)) {
            records.forEach(comActDynVO1 -> {
                if(comActDynVO1.getCategory()!=null&&comActDynVO1.getCategory()==4){
                    comActDynVO.setContent(null);
                    comActDynVO1.setContent(null);
                }else {
                    String content = comActDynVO1.getContent();
                    if (!ObjectUtils.isEmpty(content)) {
@@ -116,7 +116,7 @@
            }
            comActDynDAO.updateById(comActDynDO);
        }
        return R.ok(comActDynVO);
        return R.ok();
    }

    /**