Merge bnjing@123

ranch 'develop' of http://192.168.11.14:51037/gitadmin/tuoheng_freeway into develop

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionFileServiceImpl.java

@@ -425,7 +425,7 @@ public class InspectionFileServiceImpl implements IInspectionFileService {
         BeanUtils.copyProperties(inspection, vo);
         //对视频地址进行处理
         if (StringUtils.isNotEmpty(inspection.getAiVideoUrl())) {
-            vo.setAiVideoUrl(CommonConfig.videoURL + inspection.getVideoUrl());
+            vo.setAiVideoUrl(CommonConfig.videoURL + inspection.getAiVideoUrl());
         }
 
         return JsonResult.success(vo);

tuoheng-service/tuoheng-miniprogram/src/main/java/com/tuoheng/miniprogram/service/impl/InspectionServiceImpl.java

@@ -202,7 +202,7 @@ public class InspectionServiceImpl implements IInspectionService {
         BeanUtils.copyProperties(inspection,vo);
         //对视频地址进行处理
         if(StringUtils.isNotEmpty(inspection.getAiVideoUrl())){
-            vo.setAiVideoUrl(CommonConfig.videoURL+inspection.getVideoUrl());
+            vo.setAiVideoUrl(CommonConfig.videoURL+inspection.getAiVideoUrl());
         }
 
         return JsonResult.success(vo);