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

tangxiaobao

2021-09-17 da8968983a3092e6d20158bf42f8c7f902f806e8

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

@@ -481,9 +481,11 @@
            new QueryWrapper<ComActQuestnaireSubDO>().lambda().eq(ComActQuestnaireSubDO::getQueId, questId));
        List<ComActQuestnaireSubVO> listSubVo = new ArrayList<>();
        list.forEach(subDo -> {
            if(!subDo.getType().equals(ComActQuestnaireSubDO.type.describe)){
            ComActQuestnaireSubVO comActQuestnaireSubVO = new ComActQuestnaireSubVO();
            BeanUtils.copyProperties(subDo, comActQuestnaireSubVO);
            listSubVo.add(comActQuestnaireSubVO);
            }
        });
        questnaireAnswersDTO.setSubs(listSubVo);
        /**