From fc4f4e0dd0ddb92065a81fcce6e99cc5dbf80068 Mon Sep 17 00:00:00 2001
From: Fixiaobai <fixiaobai@163.com>
Date: 星期四, 24 八月 2023 18:04:16 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/Menu.java | 6 +++---
1 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/Menu.java b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/Menu.java
index b9cd220..12c7ddb 100644
--- a/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/Menu.java
+++ b/laboratory-server/src/main/java/com/yuanchu/limslaboratory/pojo/Menu.java
@@ -16,18 +16,18 @@
/**
* id
*/
- private Integer value;
+ private Long id;
/**
* 鑿滃崟鍚�
*/
- private String label;
+ private String name;
/**
* 鐖剁骇id
*/
- private Integer parentId;
+ private Long parentId;
/**
* 瀛愮骇鑿滃崟淇℃伅
--
Gitblit v1.9.3