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/fancy/blank.gif){kind=link}
/Newshotspot/html%20template/img/fancy/fancy_close.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancy_loading.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancy_nav_left.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancy_nav_right.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancy_shadow_e.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancy_shadow_n.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancy_shadow_ne.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancy_shadow_nw.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancy_shadow_s.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancy_shadow_se.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancy_shadow_sw.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancy_shadow_w.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancy_title_left.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancy_title_main.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancy_title_over.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancy_title_right.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancybox-x.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancybox-y.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancybox.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancybox_loading.gif){kind=link}
/Newshotspot/html%20template/img/fancy/fancybox_loading@2x.gif){kind=link}
/Newshotspot/html%20template/img/fancy/fancybox_overlay.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancybox_sprite.png){kind=link}
/Newshotspot/html%20template/img/fancy/fancybox_sprite@2x.png){kind=link}