Merge branch 'feature/admin' into preview
commit
56402b081b
|
@ -6,7 +6,6 @@ import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
|
|||
import com.mcwl.common.core.domain.entity.SysUser;
|
||||
import com.mcwl.common.utils.SecurityUtils;
|
||||
import com.mcwl.common.utils.StringUtils;
|
||||
import com.mcwl.resource.domain.ModelImageComment;
|
||||
import com.mcwl.resource.domain.SysAdvice;
|
||||
import com.mcwl.resource.domain.WorkFlowComment;
|
||||
import com.mcwl.resource.domain.WorkFlowCommentLike;
|
||||
|
@ -275,7 +274,7 @@ public class WorkFlowCommentServiceImpl extends ServiceImpl<WorkFlowCommentMappe
|
|||
|
||||
WorkFlowCommentVo vo = new WorkFlowCommentVo();
|
||||
vo.setUserId(comment.getUserId());
|
||||
vo.setUserName(user.getUserName());
|
||||
vo.setUserName(user.getNickName());
|
||||
vo.setUserAvatar(user.getAvatar());
|
||||
vo.setCommentId(comment.getId());
|
||||
vo.setContent(comment.getContent());
|
||||
|
|
Loading…
Reference in New Issue