Merge remote-tracking branch 'origin/main'

# Conflicts:
#	app/controller/Overview.php

app/controller/Overview.php

@@ -58,12 +58,10 @@ class Overview extends BaseController
             $dashboardData['online_data'] = [];
             $dashboardData['login_data'] = [];
 
-
             return json_success($dashboardData, '获取成功');
-            // return json(['code' => 0, 'msg' => 'success', 'data' => $dashboardData]);
+            
         } catch (\Exception $e) {
-            return json_error([], '获取仪表盘数据失败：' . $e->getMessage());
-            // return json(['code' => -1, 'msg' => '获取仪表盘数据失败: ' . $e->getMessage()]);
+            return json_error([], '获取仪表盘数据失败' . $e->getMessage());
         }
     }