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

huanghongfa

2021-09-30 fe609c99cd295ac64aa76e31eee4ae21bb167302

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/config/WebSocketClient.java

@@ -78,6 +78,7 @@
            comPropertyAlarm.setSerialNo(deviceInfo.getCallid());
            comPropertyAlarm.setStatus(1);
            comPropertyAlarm.setCreateTime(new Date());
            comPropertyAlarm.setType(1);
            comPropertyAlarmDao.insert(comPropertyAlarm);
        }
    }