Merge branch 'master' of git://github.com/Bytom/dashboard into dashboardmaster

diff --cc package-lock.json
index 702b3c7,6f59671..734b4dc
--- 1/package-lock.json
--- 2/package-lock.json
+++ b/package-lock.json
@@@ -7928,14 -5249,9 +7928,9 @@@
          }
        }
      },
-     "react-console-component": {
-       "version": "0.6.1",
-       "resolved": "https://registry.npmjs.org/react-console-component/-/react-console-component-0.6.1.tgz",
-       "integrity": "sha1-JBvp/O6BXljNbeiciepytq4StiY="
-     },
      "react-deep-force-update": {
        "version": "1.1.1",
 -      "resolved": "https://registry.npmjs.org/react-deep-force-update/-/react-deep-force-update-1.1.1.tgz",
 +      "resolved": "http://registry.npm.taobao.org/react-deep-force-update/download/react-deep-force-update-1.1.1.tgz",
        "integrity": "sha1-vNMUeAJ7ZLMznxCJIatSC0MT3Cw=",
        "dev": true
      },

diff --cc package.json
Simple merge