Merge branch 'dev_wf' of wugg/cxinv into dev

app/admin/controller/User.php

@@ -631,7 +631,7 @@ class User extends BaseController{
 
 
             if ($userrole) {
-                $up = Db::name("user_role")->insert($userrole);
+                $up = Db::name("user_role")->insertAll($userrole);
                 if ($up == false) {
                     return error_show(1004, '账户角色分配失败');
                 }