Merge branch 'feature/mzl_dev' into develop

# Conflicts:
#	app/common/controller/AuthController.php
#	app/common/logic/AuthLogic.php
#	app/common/model/User.php
#	app/controller/IndexController.php
#	app/functions.php
#	app/middleware/AuthCheck.php
#	app/view/index/qrcode.html
#	composer.json
#	composer.lock
#	config/middleware.php
#	config/route.php
#	config/whitelist.php

app/common/controller/BaseController.php

@@ -4,12 +4,13 @@ namespace app\common\controller;
 
 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;