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

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