Merge remote-tracking branch 'origin/master' into master

lyfO_o

2021-12-13 7d4f221ad350447684beb2bced054d659c5592a1

 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 {