Merge branch 'develop'

app/controller/IndexController.php

@@ -6,6 +6,7 @@ use app\common\model\InquiryLog;
 use app\common\model\User;
 use app\common\model\UserRoles;
 use app\common\model\UserSystems;
+use app\common\traits\DataPermission;
 use app\common\utils\email\MailSend;
 use app\common\utils\scaffold\Generate;
 use support\Request;
@@ -105,9 +106,8 @@ class IndexController
     public function test()
     {
 
-        $data = MailSend::getContent(22);
-        MailSend::send('mzl@hnxinyouhe.com', '【XYH】新的客户线索', replaceTpl($data));
-
+        $data = DataPermission::getRoleTreeUserIds(1);
+        var_dump($data);
         return 22;
     }
 }