Merge branch 'develop' into feature/crmAdmin0717

# Conflicts:
#	app/admin/controller/RoleController.php
#	app/common/controller/AuthController.php
#	app/common/logic/AuthLogic.php
#	app/common/logic/PermLogic.php
#	app/common/model/User.php
#	app/common/service/PermService.php
#	app/common/validate/RoleValidate.php
#	app/controller/IndexController.php
#	app/functions.php
#	app/ticket/controller/ConversationController.php
#	app/ticket/controller/TicketController.php
#	app/ticket/logic/TicketLogic.php
#	app/ticket/service/CategorieService.php
#	app/ticket/service/TicketService.php
#	app/view/index/qrcode.html
#	composer.json
#	composer.lock
#	config/middleware.php
#	config/route.php
#	config/whitelist.php

app/common/service/AuthService.php

@@ -31,7 +31,7 @@ class AuthService
 
         return match ($loginType) {
             'feishu'  => $logic->feishuLogin($data),
-            // 'qrcode'  => $logic->qrCodeLogin($data),
+            'qrcode'  => $logic->qrCodeLogin($data),
             default   => $logic->uPwdLogin($data),
         };
     }
@@ -86,13 +86,4 @@ class AuthService
     {
         (new AuthLogic())->blockToken($token, $systemCode);
     }
-
-
-    // public function perms()
-    // {
-    //     $permService = new PermService();
-    //     $menuTree = $permService->getMenuTree($uid);
-    //     $permissionCodes = $permService->getPermissionCodes($uid);
-    //     return (new PermService())->getMenuTree($this->userId)
-    // }
 }

app/common/service/CorpFeishuAppService.php

@@ -1,21 +0,0 @@
-<?php
-
-namespace app\common\service;
-
-use app\common\logic\CorpFeishuAppLogic;
-
-class CorpFeishuAppService
-{
-
-    protected $logic;
-
-    public function __construct()
-    {
-        $this->logic = (new CorpFeishuAppLogic());
-    }
-
-    public function getFeishuApp(int $corpId)
-    {
-        return $this->logic->getFeishuApp($corpId);
-    }
-}

app/common/service/CorpService.php

@@ -1,24 +0,0 @@
-<?php
-
-namespace app\common\service;
-
-use app\common\logic\CorpLogic;
-
-class CorpService
-{
-
-    protected $logic;
-
-    public function __construct()
-    {
-        $this->logic = (new CorpLogic());
-    }
-
-    /**
-     * 获取公司list
-     */
-    public function getList()
-    {
-        return $this->logic->getList();
-    }
-}