Merge branch 'develop'

app/common/controller/BaseController.php

@@ -2,15 +2,15 @@
 
 namespace app\common\controller;
 
-use support\Request;
-use support\Response;
 use support\exception\BusinessException;
 use app\common\traits\ResponseTrait;
+use app\common\traits\DataTransformer;
 use think\Validate;
+use support\Request;
 
-abstract class BaseController
+class BaseController
 {
-    use ResponseTrait;
+    use ResponseTrait, DataTransformer;
 
     protected mixed $validator = null;
 
@@ -37,4 +37,12 @@ abstract class BaseController
         // 验证成功，返回原始数据
         return $data;
     }
+
+    /**
+     * 参数处理
+     */
+    public function requestData(Request $request)
+    {
+        return $request->all() + $request->basic_data;
+    }
 }