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

bingbing

2020-10-27 1d5345f92dbd4aac2b5f68265921bb2529a71b8e

 pom.xml

@@ -51,7 +51,7 @@
        <easypoi.version>4.1.0</easypoi.version>
        <poi.version>4.1.0</poi.version>
        <druid-starter>1.1.10</druid-starter>
        <mybatis-plus-boot-starter.version>3.3.1</mybatis-plus-boot-starter.version>
        <mybatis-plus-boot-starter.version>3.4.0</mybatis-plus-boot-starter.version>
        <p6spy.version>3.8.6</p6spy.version>
        <swagger.version>2.9.2</swagger.version>
        <guava.version>28.1-jre</guava.version>