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

huanghongfa

2021-07-22 02f18587bd8860b305e2c688e20465be166bb48c

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

@@ -109,6 +109,7 @@
            "d.photo_pah, " +
            "d.`discuss_subject`, " +
            "d.type, " +
            "u.type as userType, " +
            "COUNT( DISTINCT c.id ) commentNum, " +
            "COUNT( DISTINCT du.id ) signNum, " +
            "if(u.type=1,u.name,a.name) userName, " +
@@ -148,6 +149,7 @@
            "u.nick_name userNickName, " +
            "u.`image_url`, " +
            "u.phone, " +
            "u.type as userType, " +
            "c.`comment`, " +
            "c.`parent_id`, " +
            "c.`is_author`, " +