# Conflicts:
#	nladmin-system/pom.xml
#	nladmin-system/src/main/resources/config/application-dev.yml
This commit is contained in:
lyd
2022-10-08 17:21:14 +08:00
310 changed files with 33004 additions and 41 deletions

View File

@@ -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>