Merge branch 'develop'

app/common/controller/PresetController.php

@@ -19,6 +19,7 @@ use app\common\service\SystemsService;
 use app\common\service\UserService;
 use support\Cache;
 use app\common\service\PermService;
+use app\common\service\UserGroupService;
 
 class PresetController extends BaseController
 {
@@ -207,4 +208,26 @@ class PresetController extends BaseController
             return $this->error($e->getMessage());
         }
     }
+
+
+    public function userGroup(Request $request)
+    {
+        try {
+            $result = (new UserGroupService)->userGroup($request);
+            return $this->success($result, '获取分组');
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
+
+
+    public function userGroupScene(Request $request)
+    {
+        try {
+            $result = (new UserGroupService)->userGroupScene($request);
+            return $this->success($result, '获取分组场景');
+        } catch (\Throwable $e) {
+            return $this->error($e->getMessage());
+        }
+    }
 }