Merge remote-tracking branch 'origin/master'

# Conflicts:
#	.env-example
This commit is contained in:
2026-03-21 11:19:28 +08:00
32 changed files with 327 additions and 66 deletions

View File

@@ -8,7 +8,7 @@ APP_DEFAULT_TIMEZONE = Asia/Shanghai
# 语言
LANG_DEFAULT_LANG = zh-cn
# 数据库config/thinkorm.php
# 数据库config/thinkorm.php/database.php
DATABASE_DRIVER = mysql
DATABASE_TYPE = mysql
DATABASE_HOSTNAME = 127.0.0.1