This reverts commit 24391856. # Conflicts: # 14.java转C#/TestC/.vs/TestC/v15/.suo # 14.java转C#/TestC/.vs/TestC/v15/Server/sqlite3/storage.ide-shm # 14.java转C#/TestC/.vs/TestC/v15/Server/sqlite3/storage.ide-wal # 15.国海推荐/8月桌面-国海推荐逻辑/201805证监会上市公司行业分类.xlsx # 17.identity第三方/配置实例：访问测试.doc # 20.智能资讯/智能资讯相关文档/华金运维环境配置.xlsx # 21.华金/华金智能资讯准生产、生产登录部署.doc # 21.华金/华金服务器环境.xlsx # 23.埋点（国海-积财）/国海推荐-接口.doc # 23.埋点（国海-积财）/国海智能资讯AB测试项目计划.xls
/Newshotspot/html%20template/img/._arrow-left.png){kind=link}
/Newshotspot/html%20template/img/._arrow-right.png){kind=link}
/Newshotspot/html%20template/img/._bg.png){kind=link}
/Newshotspot/html%20template/img/._bg2.png){kind=link}
/Newshotspot/html%20template/img/._bodybg.png){kind=link}
/Newshotspot/html%20template/img/._bodybg2.png){kind=link}
/Newshotspot/html%20template/img/._dribble.png){kind=link}
/Newshotspot/html%20template/img/._facebook.png){kind=link}
/Newshotspot/html%20template/img/._forrst.png){kind=link}
/Newshotspot/html%20template/img/._light.jpg){kind=link}
/Newshotspot/html%20template/img/._login_bg.png){kind=link}
/Newshotspot/html%20template/img/._magnifier_grey.png){kind=link}
/Newshotspot/html%20template/img/._retina_wood.png){kind=link}
/Newshotspot/html%20template/img/._slider.png){kind=link}
/Newshotspot/html%20template/img/._slider_hover.png){kind=link}
/Newshotspot/html%20template/img/._sort_asc.png){kind=link}
/Newshotspot/html%20template/img/._sort_asc_disabled.png){kind=link}
/Newshotspot/html%20template/img/._sort_both.png){kind=link}
/Newshotspot/html%20template/img/._sort_desc.png){kind=link}
/Newshotspot/html%20template/img/._sort_desc_disabled.png){kind=link}
/Newshotspot/html%20template/img/._toggle-subnav-down-white.png){kind=link}
/Newshotspot/html%20template/img/._toggle-subnav-down.png){kind=link}
/Newshotspot/html%20template/img/._toggle-subnav-up-white.png){kind=link}
/Newshotspot/html%20template/img/._toggle-subnav-up.png){kind=link}
/Newshotspot/html%20template/img/._twitter.png){kind=link}
/Newshotspot/html%20template/img/._wood-black.jpg){kind=link}
/Newshotspot/html%20template/img/._wood.jpg){kind=link}
/Newshotspot/html%20template/img/arrow-left.png){kind=link}
/Newshotspot/html%20template/img/arrow-right.png){kind=link}
/Newshotspot/html%20template/img/bg.png){kind=link}
/Newshotspot/html%20template/img/bg2.png){kind=link}
/Newshotspot/html%20template/img/blank.gif){kind=link}
/Newshotspot/html%20template/img/bodybg.png){kind=link}
/Newshotspot/html%20template/img/bodybg2.png){kind=link}
/Newshotspot/html%20template/img/buttons-disabled.png){kind=link}
/Newshotspot/html%20template/img/buttons.gif){kind=link}
/Newshotspot/html%20template/img/buttons.png){kind=link}
/Newshotspot/html%20template/img/chosen-sprite.png){kind=link}
/Newshotspot/html%20template/img/dribble.png){kind=link}
/Newshotspot/html%20template/img/facebook.png){kind=link}
/Newshotspot/html%20template/img/forrst.png){kind=link}
/Newshotspot/html%20template/img/glyphicons-halflings-white.png){kind=link}
/Newshotspot/html%20template/img/glyphicons-halflings.png){kind=link}
/Newshotspot/html%20template/img/light.jpg){kind=link}
/Newshotspot/html%20template/img/login_bg.png){kind=link}
/Newshotspot/html%20template/img/low_contrast_linen.png){kind=link}
/Newshotspot/html%20template/img/magnifier_grey.png){kind=link}
/Newshotspot/html%20template/img/natural_paper.png){kind=link}
/Newshotspot/html%20template/img/preload.gif){kind=link}
/Newshotspot/html%20template/img/retina_wood.png){kind=link}
/Newshotspot/html%20template/img/slider.png){kind=link}
/Newshotspot/html%20template/img/slider_hover.png){kind=link}
/Newshotspot/html%20template/img/sort_asc.png){kind=link}
/Newshotspot/html%20template/img/sort_asc_disabled.png){kind=link}
/Newshotspot/html%20template/img/sort_both.png){kind=link}
/Newshotspot/html%20template/img/sort_desc.png){kind=link}
/Newshotspot/html%20template/img/sort_desc_disabled.png){kind=link}
/Newshotspot/html%20template/img/spinner_arrows.gif){kind=link}
/Newshotspot/html%20template/img/throbber.gif){kind=link}
/Newshotspot/html%20template/img/toggle-subnav-down-white.png){kind=link}
/Newshotspot/html%20template/img/toggle-subnav-down.png){kind=link}
/Newshotspot/html%20template/img/toggle-subnav-up-white.png){kind=link}
/Newshotspot/html%20template/img/toggle-subnav-up.png){kind=link}
/Newshotspot/html%20template/img/toolbar.gif){kind=link}
/Newshotspot/html%20template/img/transp50.png){kind=link}
/Newshotspot/html%20template/img/twitter.png){kind=link}
/Newshotspot/html%20template/img/wood-black.jpg){kind=link}
/Newshotspot/html%20template/img/wood.jpg){kind=link}