Merge branch 'local_20221024' into huacheng_test

yanghui

2022-11-01 d6f2a3d6c68cc2626b3a1baef7383e66a0f7a58e

 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)) {