Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

疯狂的狮子li

2020-11-25 6d900dc6547554e711c2e710925a5a761ee34bc1

Merge branch 'master' of https://gitee.com/y_project/RuoYi-Vue

 pom.xml

@@ -24,8 +24,8 @@
        <kaptcha.version>2.3.2</kaptcha.version>

        <pagehelper.boot.version>1.3.0</pagehelper.boot.version>

        <fastjson.version>1.2.74</fastjson.version>

        <oshi.version>5.2.5</oshi.version>

        <jna.version>5.5.0</jna.version>

        <oshi.version>5.3.6</oshi.version>

        <jna.version>5.6.0</jna.version>

        <commons.io.version>2.5</commons.io.version>

        <commons.fileupload.version>1.3.3</commons.fileupload.version>

        <poi.version>3.17</poi.version>