Merge branch 'feature/promote_company_merge' of wmtx/platform into release

优化

Application/Admin/Controller/UserController.class.php

@@ -392,8 +392,8 @@ class UserController extends AdminController
             if (is_null($group)) {
                 $this->error('角色类型不存在！');
             } else {
-                if (!IS_ROOT && strpos($group['title'], '市场专员') !== false && !isMarketLeader()) {
+                if (isMarketLeader() && strpos($group['title'], '市场专员') === false) {
-                    $this->error('市场专员编辑仅允许市场总监操作！');
+                    $this->error('市场总监只允许操作允许编辑市场专员账号！');
                 }
             }
 //            if (isset($_POST['mobile']) && $_POST['mobile'] != '') {