Merge branch '1.0' into 2.0

src/Service/Interfaces/UserServiceInterface.php

@@ -79,9 +79,9 @@ interface UserServiceInterface
 
     /**
      * 获取当前数据权限的配置
-     * @example store_warehouse_index(store_模块的名称，warehouse_ 控制器 index 方法)
      * @param string $dataPerm
      * @return array
+     * @example store_warehouse_index(store_模块的名称，warehouse_ 控制器 index 方法)
      */
     public function checkDataPerm(string $dataPerm): array;
 
@@ -148,4 +148,12 @@ interface UserServiceInterface
      */
     public function belongToDepartments($userId, $deptId, $withChildren = false): bool;
 
+    /**
+     * 获取用户所有角色数据
+     * @param $userId
+     * @return array
+     * @author Zero
+     */
+    public function getRoles($userId): array;
+
 }