Merge branch 'develop' into feature/main/dailyflight

pav-server/src/main/java/com/palnet/biz/api/bas/flight/controller/BasFlightController.java

@@ -391,10 +391,10 @@ public class BasFlightController {
         return ResponseEntity.ok().body(new SuccessResponse<List>(response));
     }
 
-    @PostMapping("/coord")
+//    @PostMapping("/coord")
-    public JSONObject coordTest(@RequestBody Coordinate coordinate) throws IOException, ParseException {
+//    public JSONObject coordTest(@RequestBody Coordinate coordinate) throws IOException, ParseException {
-    	
+//
-    	return FlightUtils.getCoordinateGis(coordinate);
+//    	return FlightUtils.getCoordinateGis(coordinate);
-    	
+//
-    }
+//    }
 }

pav-server/src/main/java/com/palnet/biz/api/main/statistics/service/MainStatisticsService.java

@@ -87,7 +87,7 @@ public class MainStatisticsService {
 					}
 
 					result[0] = "%Y-%m-%d";
-					result[1] = "%Y-%m-%d";
+					result[1] = "%H:00:00";
 				} else {
 					throw new NumberFormatException();
 				}