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

CeDo

2021-05-20 5ade6f6e4532b65b96d80eabe5d92302f6f817f4

 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());
                }
            }