bihuisong 1 年之前
父节点
当前提交
d4843f3d37

+ 2 - 2
songhua-admin/src/main/java/com/songhua/web/controller/ship/CruiseShipMappingController.java

@@ -91,7 +91,7 @@ public class CruiseShipMappingController extends BaseController
     }
 
     @GetMapping("/shipRoute")
-    public List<Map<String, Object>> getCombinedCruiseData() {
-        return cruiseShipMappingService.getShipRouteData();
+    public AjaxResult getCombinedCruiseData() {
+        return success(cruiseShipMappingService.getShipRouteData());
     }
 }