Merge branch 'master' of http://git.qiniu1314.com/cmy/CBB3

manifest.json

@@ -2,8 +2,8 @@
     "name" : "易趣CBB",
     "appid" : "__UNI__2978829",
     "description" : "一款电商App",
-    "versionName" : "3.2.9",
-    "versionCode" : 329,
+    "versionName" : "3.3.1",
+    "versionCode" : 331,
     "transformPx" : false,
     /* 5+App特有相关 */
     "app-plus" : {