Merge branch 'develop' of gitadmin/tuoheng_lc into release

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/IndexServiceImpl.java

 
     @Override
     public JsonResult getAirportDetail(Integer airportId){
-        String url = CommonConfig.airportURL +"/api/airportInterface/getAirportStatus";
+        String url = CommonConfig.airportURL + "/api/airportInterface/getAirportStatus";
         String param = "airportId=" + airportId;
         String result = HttpUtils.sendGet(url, param);
         JsonResult jsonResult = JacksonUtil.json2pojo(result, JsonResult.class);
             if(hpa != null){
                 BigDecimal mpa = hpa.divide(new BigDecimal(100000), 1, BigDecimal.ROUND_HALF_UP);
                 airportDetailDto.setHpa(mpa + "Mpa");
+                airportDetailDto.setHpa(hpa + "Mpa");
             }
         }
         JSONObject tahJson = dataObject.getJSONObject("TAH");