Merge branch 'feature/mzl_dev' into develop

# Conflicts:
#	app/common/controller/AuthController.php
#	app/common/logic/AuthLogic.php
#	app/common/model/User.php
#	app/controller/IndexController.php
#	app/functions.php
#	app/middleware/AuthCheck.php
#	app/view/index/qrcode.html
#	composer.json
#	composer.lock
#	config/middleware.php
#	config/route.php
#	config/whitelist.php

app/common/service/RoleService.php

@@ -0,0 +1,55 @@
+<?php
+
+namespace app\common\service;
+
+use app\common\logic\RoleLogic;
+
+class RoleService
+{
+    protected $roleLogic;
+
+    public function __construct()
+    {
+        $this->roleLogic = (new RoleLogic());
+    }
+
+    /**
+     * 获取角色列表
+     */
+    public function getRoleList(array $params)
+    {
+        return $this->roleLogic->getRoleList($params);
+    }
+
+    /**
+     * 获取角色详情
+     */
+    public function getRoleDetail(int $roleId)
+    {
+        return $this->roleLogic->getRoleDetail($roleId);
+    }
+
+    /**
+     * 创建角色
+     */
+    public function createRole(array $data)
+    {
+        return $this->roleLogic->createRole($data);
+    }
+
+    /**
+     * 更新角色
+     */
+    public function updateRole(array $data)
+    {
+        return $this->roleLogic->updateRole($data);
+    }
+
+    /**
+     * 删除角色
+     */
+    public function deleteRole(int $roleId)
+    {
+        return $this->roleLogic->deleteRole($roleId);
+    }
+}