Merge branch 'master' into develop

# Conflicts: # app/common/utils/WsEvents.php # app/controller/IndexController.php
2025-10-12 17:40:37 +08:00
parent c8ca4e0d28
commit 4376c668ba
3 changed files with 28 additions and 9 deletions
@@ -291,7 +291,7 @@ class WsEvents
    {
        $ly = [
            1 => 186,
-            3 => 226,
+            3 => 224,
        ];

        if ($num === 0) {