From 10e83311f7457f07b3d0928fba0de6a5622f1748 Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期四, 06 三月 2025 09:57:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into develop_alioo

---
 zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/AlarmAnalyisisController.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/AlarmAnalyisisController.java b/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/AlarmAnalyisisController.java
index bcc801c..8766e28 100644
--- a/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/AlarmAnalyisisController.java
+++ b/zhitan-admin/src/main/java/com/zhitan/web/controller/alarm/AlarmAnalyisisController.java
@@ -12,7 +12,7 @@
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * description todu
+geng * description 鎶ヨ鍒嗘瀽鐩稿叧鍔熻兘
  *
  * @author hmj
  * @date 2024-10-26 17:31

--
Gitblit v1.9.3