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/controller/PresetController.php

@@ -1,36 +0,0 @@
-<?php
-
-namespace app\common\controller;
-
-use support\Request;
-use app\common\service\CorpService;
-use app\common\service\CorpFeishuAppService;
-
-class PresetController extends BaseController
-{
-
-    protected $noNeedLogin = ['corps', 'feishuApp'];
-
-    public function corps()
-    {
-        try { 
-            $result = (new CorpService())->getList();
-            return $this->success($result, '获取公司列表');
-        } catch (\Throwable $e) {
-            return $this->error($e->getMessage());
-        }
-    }
-
-
-
-    public function feishuApp(Request $request)
-    {
-        try {
-            $corpId = $request->get('corp_id');
-            $result = (new CorpFeishuAppService())->getFeishuApp($corpId);
-            return $this->success($result, '获取飞书应用信息');
-        } catch (\Throwable $e) {
-            return $this->error($e->getMessage());
-        }
-    }
-}