wl
Merge branch 'master' of https://github.com/xiaoliang2535/xocean
set npm start
Merge branch 'master' of https://github.com/changyou/xocean
fix url error when build
disable cache for imagemin task
not reload dummydata when on production env
Article list done.
rm idea folder
add jobnumber field and add setinfo page
Merge remote-tracking branch 'changyou/master'
Merge pull request #20 from meterler/master

增加工号字段+增加编辑个人信息页
clean code
Merge branch 'master' of https://github.com/changyou/xocean
merge from mengliu222
merge from fengliu222
Merge pull request #21 from meterler/master

merge
clean code
disable dummydata
's'