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

config/whitelist.php

@@ -4,6 +4,6 @@ return [
     'basi_cdata' => [
         '/',
         '/index/index',
-        // '/index/view'
+        '/index/view'
     ]
 ];