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

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

@@ -76,7 +76,7 @@ public class GetDroneDataByIdService {
             DroneDataVo droneDataVo = new DroneDataVo();
             droneDataVo.setInspectionId(flightData.getInspectionId());
             droneDataVo.setUavPower(79 + "%");
-            droneDataVo.setRange("");
+            droneDataVo.setRange(6 + "km");
             double dist = Integer.valueOf(flightData.getDistHome())/1000d;
             droneDataVo.setTargetLocation(dist+ "km");
             droneDataVo.setYsingal(flightData.getYsingal() + "%");

tuoheng-service/tuoheng-admin/src/main/resources/application-dev.yml

@@ -144,7 +144,8 @@ tuoheng:
   #飞手平台地址
   pilot-url: http://192.168.11.11:7011/pilot/web/
   #airport配置地址
-  airport-url: http://192.168.11.22:9060
+  #airport-url: http://192.168.11.22:9060
+  airport-url: https://airport-test.t-aaron.com
   # 文件配置
   uploads:
     #上传的服务器上的映射文件夹