Merge branch 'dev' of liubing/wlyy2.0 into dev

svr/svr-cloud-job/src/main/java/com/yihu/jw/care/service/device/PatientDeviceService.java

@@ -265,7 +265,7 @@ public class PatientDeviceService {
            //清除消息
            String sql = " select distinct dp.device_sn from device_data_push_log dp where  dp.create_time " +
                    " BETWEEN '"+startTimeDevice2+"' AND '"+endTime+"') ";
                    " BETWEEN '"+startTimeDevice2+"' AND '"+endTime+"' ";
            List<String> devices = jdbcTemplate.queryForList(sql,String.class) ;
            if (devices.size() > 0) {
                onContact.addAll(devices);