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

zc-business/src/main/java/com/zc/business/message/device/handler/DeviceMessageHandler.java

@@ -148,11 +148,17 @@ public class DeviceMessageHandler {
         }
 
         JSONArray pictures = data.getJSONArray("pictures");
+        JSONArray video = data.getJSONArray("videoList");
 
-        List<String>  pictureList = pictures.stream().map(picture -> (iotAddress + "/profile" + picture)).collect(Collectors.toList());
+   //     List<String>  pictureList = pictures.stream().map(picture -> (iotAddress + "/profile" + picture)).collect(Collectors.toList());
 
         JSONObject otherConfig = new JSONObject();
-        otherConfig.put("pictures", pictureList);
+        otherConfig.put("pictures", pictures);
+       /**视频地址*/
+        otherConfig.put("videoList", video);
+
+/*        JSONObject combinedData = new JSONObject();
+        combinedData.put("address", otherConfig);*/
 
         dcWarning.setOtherConfig(otherConfig.toString());