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

device-api-service/src/main/java/com/xy/service/DeviceInfoServiceImpl.java

@@ -1856,7 +1856,7 @@ public class DeviceInfoServiceImpl extends ServiceImpl<DeviceInfoMapper, DeviceI
                 records.forEach(vo2 -> {
                     List<DevicePart> devicePartss = cover.get(vo2.getDeviceId());
                     if (Emptys.check(devicePartss)) {
-                        vo2.setDeviceParts(copy(DevicePartDto.Vo.class, deviceParts));
+                        vo2.setDeviceParts(copy(DevicePartDto.Vo.class, devicePartss));
                     }
                 });
             }