Merge branch 'master' of http://192.168.0.204/yzg/yzg-util into test

pom.xml

@@ -36,7 +36,7 @@
         <fastjson.version>1.2.62</fastjson.version>
         <mysql.version>6.0.6</mysql.version>
         <poi.version>3.9</poi.version>
-        <yzg.version>1.1-SNAPSHOT</yzg.version>
+        <yzg.version>1.2-SNAPSHOT</yzg.version>
         <swagger.version>2.9.2</swagger.version>
         <guava.version>20.0</guava.version>
         <!--<jetcache.version>2.6.1</jetcache.version>-->