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

zengh

2021-01-29 83bed9e77878cbe11e797b58fa2c2a48061e4555

 blade-service/blade-jfpts/src/main/java/org/springblade/jfpt/nettyServer/ServerHandler.java

@@ -131,6 +131,7 @@
            List<Map<String, Object>> list = serverHandler.equipmentService.selectInfos(devId);
            Alarm alarm= new Alarm();
            alarm.setAlarmType("一键报警");
            alarm.setGalarmPeople("报警主机");
            Date day = new Date();
            SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
            alarm.setAlarmTime(df.format(day));