From 6984757bfc75b4a25014de1eb71c2aa75ebdb86f Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期六, 26 八月 2023 15:59:55 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 user-server/src/main/java/com/yuanchu/limslaboratory/pojo/RoleMenu.java |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/RoleMenu.java b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/RoleMenu.java
similarity index 94%
rename from laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/RoleMenu.java
rename to user-server/src/main/java/com/yuanchu/limslaboratory/pojo/RoleMenu.java
index 2bb7b23..a826b94 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/RoleMenu.java
+++ b/user-server/src/main/java/com/yuanchu/limslaboratory/pojo/RoleMenu.java
@@ -26,6 +26,12 @@
 
     private String menuName;
 
+    private String menuUrl;
+
+    private String redirect;
+
+    private String icon;
+
     private Long menuId;
 
     private Boolean selected;

--
Gitblit v1.9.3