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/model/Role.php

@@ -41,6 +41,8 @@ class Role extends Model
      * @var bool
      */
     public $timestamps = true;
+
+    protected $dateFormat = 'U';
     
     // 角色下所有用户
     public function users()