Merge branch 'master' of https://gitee.com/microapp/flash-waimai

pom.xml

@@ -40,7 +40,7 @@
         <mail.version>1.4.7</mail.version>
         <httpcomponents.version>4.4.1</httpcomponents.version>
         <jackson.version>2.9.0</jackson.version>
-        <fastjson.version>1.2.44</fastjson.version>
+        <fastjson.version>1.2.83</fastjson.version>
         <velocity.version>1.7</velocity.version>
         <quartz.version>2.2.1</quartz.version>
         <ehcache.version>3.3.1</ehcache.version>