Merge branch 'develop' of gitadmin/tuoheng_lc into release

tuoheng-admin/src/main/java/com/tuoheng/admin/service/third/airport/PointFlightService.java

@@ -145,7 +145,7 @@ public class PointFlightService {
                         .eq(ThMission::getMark, MarkEnum.VALID.getCode()));
                 if (TaskStatusEnum.FLIGHT.getCode() == missionTmp.getStatus()) {
                     log.info("原机场正在执行任务");
-                    throw new ServiceException("原机场正在执行任务");
+                    throw new ServiceException("发现该问题的机场正在执行任务");
                 }
             }
         } else {
@@ -155,7 +155,7 @@ public class PointFlightService {
                     .eq(ThMission::getMark, MarkEnum.VALID.getCode()));
             if (ObjectUtil.isNotNull(missionTmp)) {
                 log.info("新机场正在执行任务");
-                throw new ServiceException("新机场正在执行任务");
+                throw new ServiceException("该机场正在执行任务");
             }
         }
         return JsonResult.success(mission);

tuoheng-admin/src/main/java/com/tuoheng/admin/service/warning/details/WarningDetailsService.java

@@ -80,7 +80,7 @@ public class WarningDetailsService {
         }
         String fileOriginalUrl = question.getFileOriginalUrl();
         if(StringUtils.isNotEmpty(fileOriginalUrl)){
-            vo.setFileOriginalUrl(CommonConfig.imageURL+fileOriginalUrl);
+            vo.setFileOriginalUrl(fileOriginalUrl);
         }
         //火灾核实记录 一条预警对应多条火灾预警记录
         List<WarningRecordVO> warningRecordVo = new ArrayList<>();