公会合并测试

application/adminapi/controller/Guild.php

@@ -642,6 +642,8 @@ class Guild extends adminApi
                     db::rollback();
                     return V(0,"失败");
                 }
+                //更新公会人数
+                db('vs_guild')->where('id', $merge_guild_id)->setInc('num');
                 //拉用户进入工会群聊
                 $rid = 'g'.$merge_guild_id;
                 $reslut = model('api/Tencent')->add_group_member($rid, $value['user_id']);