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

zhaowenyu

2025-11-15 1e2f717393e4053a3b8de11cbf67cd98a8c77ec1

 ard-admin/src/main/java/com/ard/web/controller/route/ArdRouteInfoController.java

@@ -113,10 +113,10 @@
     */
    @ApiOperation("修改航线分组ID")
    @Log(title = "航线(kmz)", businessType = BusinessType.UPDATE)
    @PutMapping("/updateGroupingId/{id}/{groupingId}")
    public AjaxResult updateGroupingId(@PathVariable("id") String id,
                                     @PathVariable("groupingId") String groupingId) {
        return toAjax(ardRouteInfoService.updateRouteInfomationGroupingId(id,groupingId));
    @PutMapping("/updateGroupId/{id}/{groupId}")
    public AjaxResult updateGroupId(@PathVariable("id") String id,
                                     @PathVariable("groupId") String groupId) {
        return toAjax(ardRouteInfoService.updateRouteInfomationGroupId(id,groupId));
    }

    /**