Merge branch 'develop' of ssh://121.40.92.176:29418/screen-frontend into de...

沈斌

2018-03-08 f320f1970e5d80a423f377fb3253628bd1e7f5bf

 .gitignore

@@ -38,4 +38,6 @@
Thumbs.db
.angulardoc.json
yarn.lock
/_nginx/*
.github/*