From ea2b42d0ab6cd96118ddb030bbc3901149d6aaa7 Mon Sep 17 00:00:00 2001
From: lyfO_o <764716047@qq.com>
Date: 星期三, 27 十月 2021 16:59:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master' into master

---
 src/main/java/com/nanometer/smartlab/api/ApiAction.java |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/src/main/java/com/nanometer/smartlab/api/ApiAction.java b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
index 681306b..6021835 100644
--- a/src/main/java/com/nanometer/smartlab/api/ApiAction.java
+++ b/src/main/java/com/nanometer/smartlab/api/ApiAction.java
@@ -426,7 +426,7 @@
         return retJSON.toJSONString();
     }
 
-    // 报警情况接口(warning)
+    // 报警情况接口(warning)  货柜预警接口
     @ResponseBody
     @RequestMapping(value = "/alarm")
     public String alarm(HttpServletRequest request) throws IOException {

--
Gitblit v1.9.2