From f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae Mon Sep 17 00:00:00 2001
From: zhangchao <zc857179121@qq.com>
Date: 星期六, 02 十一月 2024 11:16:02 +0800
Subject: [PATCH] 合并代码，解决冲突
---
src/main/java/com/zy/system/entity/PdaResource.java | 4 ++++
1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/src/main/java/com/zy/system/entity/PdaResource.java b/src/main/java/com/zy/system/entity/PdaResource.java
index 61e9d57..117c210 100644
--- a/src/main/java/com/zy/system/entity/PdaResource.java
+++ b/src/main/java/com/zy/system/entity/PdaResource.java
@@ -123,5 +123,9 @@
}
}
+ public Short getLevel() {
+ return level;
+ }
+
}
--
Gitblit v1.9.1