From 17bed3a7f7e90b23afb5def223fd7a285ff6cc24 Mon Sep 17 00:00:00 2001
From: liuyg <376836862@qq.com>
Date: Tue, 10 Aug 2021 08:40:56 +0800
Subject: [PATCH] 冲突
---
src/api/alarm/alarm.js | 1 +
1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/src/api/alarm/alarm.js b/src/api/alarm/alarm.js
index ad5bc81..d1ac26b 100644
--- a/src/api/alarm/alarm.js
+++ b/src/api/alarm/alarm.js
@@ -8,6 +8,7 @@
...params,
current,
size,
+
}
})
}
--
Gitblit v1.9.3