Merge pull request 'feat:增加航线、空域、标注默认分组 sql' (#3) from main into test

Reviewed-on: http://th.local.t-aaron.com:13000/THENG/a-tuoheng-airline/pulls/3

src/main/java/com/ruoyi/airline/service/impl/AirlineMarkerGroupInfoServiceImpl.java

@@ -197,26 +197,8 @@ public class AirlineMarkerGroupInfoServiceImpl implements IAirlineMarkerGroupInf
             return List.of();
         }
         
-        // 获取所有标注分组关系，建立 markerId -> groupId 的映射
-        AirlineMarkerGroupInfo groupInfoQuery = new AirlineMarkerGroupInfo();
-        List<AirlineMarkerGroupInfo> groupInfos = iAirlineMarkerGroupInfoDomain.selectMarkerGroupInfoList(groupInfoQuery);
-        java.util.Map<Long, Long> markerGroupMap = new java.util.HashMap<>();
-        if (groupInfos != null) {
-            for (AirlineMarkerGroupInfo info : groupInfos) {
-                markerGroupMap.put(info.getMarkerId(), info.getGroupId());
-            }
-        }
-
-        // 转换为 DTO 并设置 groupId
-        java.util.List<AirlineMarkerDTO> result = new java.util.ArrayList<>();
-        for (AirlineMarker marker : markers) {
-            AirlineMarkerDTO dto = AirlineMarkerServiceConvert.from(marker);
-            if (markerGroupMap.containsKey(marker.getId())) {
-                dto.setGroupId(markerGroupMap.get(marker.getId()));
-            }
-            result.add(dto);
-        }
-        return result;
+        // 转换为 DTO 并返回
+        return AirlineMarkerServiceConvert.fromList(markers);
     }
 
     @Override