Merge branch 'feature/ci_jenkins' into 'develop'

修改ignore

See merge request o2oa/o2oa!82

.gitignore

@@ -154,5 +154,4 @@ typings/
 .factorypath
 /o2server/commons/
 /o2server/jvm/
-/o2web/ftpconfig.js
 /o2web/gulpconfig.js