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

gdg

2020-12-15 8932ae2a8dc22513c2b7925997dfb65983ea1d19

 src/main/java/com/nanometer/smartlab/service/InterfaceServiceImpl.java

@@ -1419,7 +1419,8 @@
                    content += "柜门未关";
                }
                //给daping系统发送信息
                if("1".equals(warningId) || "2".equals(warningId)|| "6".equals(warningId)) {

                if(!"".equals(alarmUrl) && ("1".equals(warningId) || "2".equals(warningId)|| "6".equals(warningId)) ) {
                    JSONObject json = new JSONObject();
                    json.put("barCode", location.get("barCode"));
                    json.put("type", alarmType);