From 320e7cd68a368a666986019e29c4af0fc9ddaa48 Mon Sep 17 00:00:00 2001
From: puzhibing <393733352@qq.com>
Date: 星期日, 12 四月 2026 20:13:21 +0800
Subject: [PATCH] 处理冲突
---
xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/account/SysGroupMenu.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/account/SysGroupMenu.java b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/account/SysGroupMenu.java
index b2642a0..b13a257 100644
--- a/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/account/SysGroupMenu.java
+++ b/xp-robotaxi-api/src/main/java/com/xiaopeng/api/model/account/SysGroupMenu.java
@@ -3,6 +3,8 @@
import com.baomidou.mybatisplus.annotation.TableName;
import java.io.Serializable;
+
+import com.github.jeffreyning.mybatisplus.anno.MppMultiId;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
@@ -26,9 +28,11 @@
private static final long serialVersionUID = 1L;
+ @MppMultiId
@ApiModelProperty(value = "权限组ID")
private Long groupId;
+ @MppMultiId
@ApiModelProperty(value = "菜单ID")
private Long menuId;
--
Gitblit v1.7.1