Merge branch 'master' of http://192.168.0.130:13000/huangxingxing/disaster_web3
# Conflicts:
# dist/assets/LabelWidget-1360a0eb.js
# dist/assets/LabelWidget-190fdb93.js
# dist/assets/LabelWidget-f27c4ba7.js
# dist/assets/SVGHelpers-2d753970.js
# dist/assets/SVGHelpers-8c61c967.js
# dist/assets/SVGHelpers-fb6ae1f1.js
# dist/assets/appmian-19f3c564.js
# dist/assets/appmian-7d66109d.js
# dist/assets/appmian-c43f5ca0.js
# dist/assets/demo-329cbc11.js
# dist/assets/demo-4c83f167.js
# dist/assets/demo-62bc325b.js
# dist/assets/index-0455dc29.js
# dist/assets/index-0ea7ec13.js
# dist/assets/index-28be8399.js
# dist/assets/index-52d0ca12.js
# dist/assets/index-553490be.js
# dist/assets/index-8f18d58b.js
# dist/assets/index-93317a37.js
# dist/assets/index-bfb11956.js
# dist/assets/index-d081f9c6.js
# dist/assets/vtk-26baebf0.js
# dist/assets/vtk-3fd73eef.js
# dist/assets/vtk-7d2f2d51.js
# dist/assets/vtk2-25ce55fc.js
# dist/assets/vtk2-42e1319c.js
# dist/assets/vtk2-9b73bbc6.js
# dist/index.html
