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

huanghongfa

2021-09-02 177249c76aeea0b4bf8d8816d4994e3b445b45ce

 springcloud_k8s_panzhihuazhihuishequ/service_community/src/main/java/com/panzhihua/service_community/dao/ComActDiscussCommentDAO.java

@@ -1,12 +1,13 @@
package com.panzhihua.service_community.dao;

import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO;
import com.panzhihua.service_community.model.dos.ComActDiscussCommentDO;
import java.util.List;

import org.apache.ibatis.annotations.Mapper;
import org.apache.ibatis.annotations.Select;

import java.util.List;
import com.baomidou.mybatisplus.core.mapper.BaseMapper;
import com.panzhihua.common.model.vos.community.ComActDiscussCommentVO;
import com.panzhihua.service_community.model.dos.ComActDiscussCommentDO;

/**
 * @program: springcloud_k8s_panzhihuazhihuishequ
@@ -29,7 +30,7 @@
    @Select("" +
            "SELECT\n" +
            "u.`name` userName,\n" +
            "u.`nick_name` userNickName,\n" +
            "IFNULL(u.`nick_name`,'社区管理员') as userNickName,\n" +
            "u.`image_url`,\n" +
            "u.phone,\n" +
            "c.`comment`,\n" +