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

application/adminapi/controller/User.php

@@ -278,7 +278,7 @@ class User extends adminApi
                 'Text' => $content
             ];
             //谁发送给谁，什么消息，是否同步到发送者1是，2否，消息是否只下发给在线用户 1 是，0 否
-            model('api/Tencent')->user_sendmsg("管理员",$user_id,json_encode($text),2,1);
+            model('api/Tencent')->user_sendmsg("管理员",$user_id,json_encode($text));
         }else{
             if($type ==1) {
                 $res = model('User')->where('id', $user_id)->update(['status' => 1]);