Merge branch 'dev' of ssh://10.10.100.21/source/saas-platform into dev

frontend/saas-web/app.json

@@ -18,7 +18,8 @@
     "requires": [
         "font-awesome",
         "ux",
-        "modern-locale"
+        "modern-locale",
+        "charts"
     ],
     "locale":"zh_CN",