Merge branch 'master' of http://121.40.234.130:8899/root/nladmin
# Conflicts: # nladmin-system/pom.xml # nladmin-system/src/main/resources/config/application-dev.yml
This commit is contained in:
@@ -15,7 +15,7 @@
|
||||
<properties>
|
||||
<jjwt.version>0.11.1</jjwt.version>
|
||||
<!-- oshi监控需要指定jna版本, 问题详见 https://github.com/oshi/oshi/issues/1040 -->
|
||||
<jna.version>5.5.0</jna.version>
|
||||
<jna.version>5.9.0</jna.version>
|
||||
<configuration.version>1.9</configuration.version>
|
||||
</properties>
|
||||
|
||||
|
||||
Reference in New Issue
Block a user