diff --git a/pom.xml b/pom.xml index b5a304514..57c1ff10e 100644 --- a/pom.xml +++ b/pom.xml @@ -26,8 +26,7 @@ 2.2.2 1.4.1 1.2.80 - 6.1.2 - 5.10.0 + 6.1.6 2.11.0 1.4 4.1.2 @@ -117,18 +116,6 @@ ${oshi.version} - - net.java.dev.jna - jna - ${jna.version} - - - - net.java.dev.jna - jna-platform - ${jna.version} - - io.springfox diff --git a/ruoyi-admin/src/main/resources/templates/monitor/server/server.html b/ruoyi-admin/src/main/resources/templates/monitor/server/server.html index f16c45e71..8730037f2 100644 --- a/ruoyi-admin/src/main/resources/templates/monitor/server/server.html +++ b/ruoyi-admin/src/main/resources/templates/monitor/server/server.html @@ -152,7 +152,7 @@
- +
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java index 932ed4692..05a6eb6c7 100644 --- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java +++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java @@ -176,7 +176,7 @@ public class SysDeptServiceImpl implements ISysDeptService public boolean checkDeptExistUser(Long deptId) { int result = deptMapper.checkDeptExistUser(deptId); - return result > 0 ? true : false; + return result > 0; } /**
Java名称