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

svr/svr-cloud-care/src/main/java/com/yihu/jw/care/service/security/SecurityMonitoringOrderService.java

@@ -1407,6 +1407,7 @@ public class SecurityMonitoringOrderService extends BaseJpaService<SecurityMonit
                        if (minuteFieldDiff>0){
                            outBedTime +=String.format("%d分钟", minuteFieldDiff);
                        }
                        sleepInfo.put("outBedTimeCrzq",outBed.getCreateTime());
                        sleepInfo.put("outBedTime",outBedTime);
                    }else {
                        sleepInfo.put("outBedTime","无");