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

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

@@ -1169,7 +1169,7 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
            sql += " and device_sn='"+deviceSn+"' ";
        }
        if (StringUtils.isNotBlank(day)){
            sql +=" and create_time>="+day+" 00:00:00 and create_time<'"+day+"' 23:59:59 ";
            sql +=" and create_time>='"+day+" 00:00:00' and create_time<'"+day+" 23:59:59' ";
        }else   {
            sql +=" order by create_time desc ";
        }