Merge branch 'develop' of gitadmin/tuoheng_air_monitor into release

tuoheng-service/tuoheng-admin/src/main/java/com/tuoheng/admin/service/airportline/add/AddAirportLineService.java

@@ -111,15 +111,17 @@ public class AddAirportLineService {
         //Integer lineId = (Integer) data.get("id");
         JSONObject dataObject = (JSONObject) JSONObject.toJSON(result.getData());
         Integer lineId = null;
+        Integer airlineFileId = null;
         if(Objects.nonNull(dataObject)){
             lineId = dataObject.getInteger("id");
-            log.info("航线id为：lineId={}",lineId);
+            airlineFileId = dataObject.getInteger("airlineFileId");
+            log.info("航线id为：lineId={}, airlineFileId={}", lineId, airlineFileId);
         }
 
         //属性赋值
         AirportLine airportLine = new AirportLine();
         airportLine.setTenantId(tenantId);
-        airportLine.setInspectionLineId(lineId);
+        airportLine.setInspectionLineId(airlineFileId);
         airportLine.setAirportLineName(airportLineName);
         airportLine.setCreateTime(DateUtils.now());
         airportLine.setCreateUser(user.getId());