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

huanghongfa

2021-05-20 db151c2d4b332a320be7813ea3eb0e0cfe9e1f11

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

@@ -591,7 +591,8 @@
        AdministratorsUserVO user = this.baseMapper.selectUserByUserId(commentDO.getUserId());
        ComActNeighborCommentByAdminVO vo = new ComActNeighborCommentByAdminVO();
        BeanUtils.copyProperties(commentDO,vo);
        vo.setUserName(user.getName());
        String name = user.getName()==null?user.getNickName():user.getName();
        vo.setUserName(name);
        return R.ok(vo);
    }