marge: 合并代码

2023-12-29 20:22:43 +08:00
parent 615ab2eb2e
commit 3c5c77b881
39 changed files with 1571 additions and 289 deletions
--- a/features/fm/alarm.go
+++ b/features/fm/alarm.go
@@ -23,8 +23,10 @@ import (
 )

 const (
-	AlarmStatusClear  = 0
-	AlarmStatusActive = 1
+	AlarmStatusClear        = 0
+	AlarmStatusActive       = 1
+	AlarmStatusClearString  = "0"
+	AlarmStatusActiveString = "1"
 )

 const (