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

huanghongfa

2021-10-01 447ca0ba704d3eca4a8b9a11e0f2bda7b13524c8

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

@@ -77,7 +77,7 @@
            logger.info("收到设备报警信息：{}", message);
            ComPropertyAlarm comPropertyAlarm = new ComPropertyAlarm();
            comPropertyAlarm.setSerialNo(deviceInfo.getUserid());
            comPropertyAlarm.setStatus(1);
            comPropertyAlarm.setStatus(0);
            comPropertyAlarm.setCreateTime(new Date());
            comPropertyAlarm.setType(1);
            comPropertyAlarmDao.insert(comPropertyAlarm);