Merge branch 'test' into 'master'

罗元桥

2021-05-20 5d55062d003a17e197523f37d68d0e88ba727219

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

@@ -295,7 +295,7 @@
        IPage<ComActEasyPhotoCommentVO> iPage = comActEasyPhotoCommentDAO.pageComActEasyPhotoComment(page, pageComActEasyPhotoCommentDTO);
        if(!iPage.getRecords().isEmpty()){
            for (ComActEasyPhotoCommentVO commentVO:iPage.getRecords()) {
                if(StringUtils.isNotEmpty(commentVO.getName())){
                if(StringUtils.isEmpty(commentVO.getName())){
                    commentVO.setName(commentVO.getNickName());
                }
            }