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

huanghongfa

2021-08-04 25b3f5f6478bae1c0c063cb5a9e47b3eef5d0052

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

@@ -29,6 +29,7 @@
    @Select("" +
            "SELECT\n" +
            "u.`name` userName,\n" +
            "u.`nick_name` userNickName,\n" +
            "u.`image_url`,\n" +
            "u.phone,\n" +
            "c.`comment`,\n" +