Merge remote-tracking branch 'origin/master'

liusheng

3 天以前 2cb8d69254e70e45d8957f60a9055f80487e17b1

 ruoyi-admin/pom.xml

@@ -166,6 +166,11 @@
            <version>5.1.0</version>
        </dependency>
        <dependency>
            <groupId>org.apache.commons</groupId>
            <artifactId>commons-compress</artifactId>
            <version>1.21</version>
        </dependency>
        <dependency>
            <groupId>cn.easyproject</groupId>
            <artifactId>orai18n</artifactId>
            <version>12.1.0.2.0</version>