合并分支 'heshupeng' 到 'master'

bug修改



查看合并请求 !114

@@ -624,7 +624,7 @@ class User extends Api
                 'user_id' => $msg['user_id'],
                 $object_id => $msg['object_id'],
                 $object_user_id => $msg['object_user_id'],
-                'type' => 2,
+                'type' => 1,
                 'content' => $param['content'],
                 'image' => $param['image'],
             ];