合并代码处理冲突

puzhibing

2026-04-12 8bf1d8f1cfcdbda64b2a80653a3ee10d31b69108

 xp-robotaxi-api/src/main/java/com/xiaopeng/api/feignClient/account/SysGroupMenuClient.java

@@ -24,6 +24,6 @@
     * @param groupId 权限组ID
     * @return 菜单ID列表
     */
    @PostMapping("/groupMenu/selectMenuIdsByGroupId")
    @PostMapping("/logan/groupMenu/selectMenuIdsByGroupId")
    R<List<Long>> selectMenuIdsByGroupId(@RequestParam("groupId") Long groupId);
}