Merge branch 'dev' of wugg/txx2023 into master

app/api/controller/Base.php

@@ -6,8 +6,8 @@ namespace app\api\controller;
 use think\App;
 use think\exception\HttpResponseException;
 use think\Response;
-
-class Base extends \app\controller\Base
+use app\BaseController;
+class Base extends BaseController
 {
 	public function __construct(App $app) {
 		parent::__construct($app);