Merge branch 'dev' of http://192.168.1.220:10080/Amoy2/wlyy2.0 into dev

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

@@ -256,7 +256,7 @@ public class PatientDeviceService extends BaseJpaService<DevicePatientDevice, Pa
            Iterator<DevicePatientDevice> iterator = page.iterator();
            while (iterator.hasNext()){
                DevicePatientDevice patientDevice = iterator.next();
                patientDevice.setDeviceImgUrl(map.get(String.valueOf(patientDevice.getDeviceId())));
                patientDevice.setDeviceImgUrl(map.get(String.valueOf(patientDevice.getCategoryCode())));
            }
        }