Merge branch 'develop' into feature/mzl_dev

# Conflicts:
#	.gitignore
#	composer.lock
This commit is contained in:
mzl
2025-12-02 14:17:25 +08:00
parent d53f18181a
commit 32a7752f8b
21 changed files with 838 additions and 35 deletions
+2 -1
View File
@@ -47,7 +47,8 @@
"phpmailer/phpmailer": "^6.10",
"webman/gateway-worker": "^1.0",
"mpdf/mpdf": "^8.2",
"jaeger/querylist": "^4.4"
"jaeger/querylist": "^4.4",
"zoujingli/ip2region": "3.0"
},
"suggest": {
"ext-event": "For better performance. "