From 91f26b740e8c26324d33dcdf25cb3ec2bca91fd6 Mon Sep 17 00:00:00 2001
From: mzl <mzl@hnxinyouhe.com>
Date: Fri, 11 Jul 2025 15:07:31 +0800
Subject: [PATCH] Merge branch 'develop' into feature/mzl_dev

# 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