Merge branch 'msg' into dev

netflix-dao/src/main/java/com/cyksj/model/manage/views/CorpMsgAuditUserView.java

@@ -17,7 +17,7 @@ import java.util.Date;
                 "and cu.external_userid = cr.corp_user_id " +
                 "and f.userid = cr.follow_id " +
                 ":tag:",
-        groupBy = "c.name,cu.external_userid,c.avatar,c.type,c.gender,f.name,cr.agree_status,cr.add_created_time"
+        groupBy = "c.name,cu.external_userid,c.avatar,c.type,c.gender,f.name,f.userid,cr.agree_status,cr.add_created_time"
 )
 public class CorpMsgAuditUserView {