Merge branch 'feature/mzl_dev' into develop

# Conflicts: # app/functions.php # config/middleware.php
2025-07-09 19:11:57 +08:00
parent 03a6d65b00
commit 3d8d9f841a
24 changed files with 1342 additions and 954 deletions
@@ -2,11 +2,10 @@

 namespace app\common\controller;

-use support\Request;
-use support\Response;
 use support\exception\BusinessException;
 use app\common\traits\ResponseTrait;
 use think\Validate;
+use support\Request;

 abstract class BaseController
 {
@@ -37,4 +36,12 @@ abstract class BaseController
        // 验证成功，返回原始数据
        return $data;
    }
+
+    /**
+     * 参数处理
+     */
+    public function requestData(Request $request)
+    {
+        return $request->all() + $request->basic_data;
+    }
 }