Merge remote-tracking branch 'origin/dev_New' into dev_New

liyong

6 天以前 7193fdcb256c3836393bff9c3ab0efe4fa56a3c0

 pom.xml

@@ -301,6 +301,12 @@
            <artifactId>easyexcel</artifactId>

            <version>4.0.3</version>

        </dependency>

        
         <dependency>

            <groupId>com.google.zxing</groupId>

            <artifactId>core</artifactId>

            <version>3.3.3</version>

        </dependency>



    </dependencies>