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/sample/._cyan_businesshandshake.jpg){kind=link}
/Newshotspot/html%20template/img/sample/._madness_car.jpg){kind=link}
/Newshotspot/html%20template/img/sample/._scottwills_crayons.jpg){kind=link}
/Newshotspot/html%20template/img/sample/._scottwills_daytime.jpg){kind=link}
/Newshotspot/html%20template/img/sample/._scottwills_enchantedcreek.jpg){kind=link}
/Newshotspot/html%20template/img/sample/._user1.png){kind=link}
/Newshotspot/html%20template/img/sample/._user2.png){kind=link}
/Newshotspot/html%20template/img/sample/._user3.png){kind=link}
/Newshotspot/html%20template/img/sample/._user4.png){kind=link}
/Newshotspot/html%20template/img/sample/._user5.png){kind=link}
/Newshotspot/html%20template/img/sample/._user6.png){kind=link}
/Newshotspot/html%20template/img/sample/._user7.png){kind=link}
/Newshotspot/html%20template/img/sample/100.gif){kind=link}
/Newshotspot/html%20template/img/sample/180x220.gif){kind=link}
/Newshotspot/html%20template/img/sample/40.gif){kind=link}
/Newshotspot/html%20template/img/sample/500.gif){kind=link}
/Newshotspot/html%20template/img/sample/60.gif){kind=link}
/Newshotspot/html%20template/img/sample/75.gif){kind=link}
/Newshotspot/html%20template/img/sample/80.gif){kind=link}
/Newshotspot/html%20template/img/sample/90.gif){kind=link}
/Newshotspot/html%20template/img/sample/cyan_businesshandshake.jpg){kind=link}
/Newshotspot/html%20template/img/sample/madness_beach.jpg){kind=link}
/Newshotspot/html%20template/img/sample/madness_car.jpg){kind=link}
/Newshotspot/html%20template/img/sample/scottwills_crayons.jpg){kind=link}
/Newshotspot/html%20template/img/sample/scottwills_daytime.jpg){kind=link}
/Newshotspot/html%20template/img/sample/scottwills_enchantedcreek.jpg){kind=link}
/Newshotspot/html%20template/img/sample/scottwills_sunset1.jpg){kind=link}
/Newshotspot/html%20template/img/sample/user1.png){kind=link}
/Newshotspot/html%20template/img/sample/user2.png){kind=link}
/Newshotspot/html%20template/img/sample/user3.png){kind=link}
/Newshotspot/html%20template/img/sample/user4.png){kind=link}
/Newshotspot/html%20template/img/sample/user5.png){kind=link}
/Newshotspot/html%20template/img/sample/user6.png){kind=link}
/Newshotspot/html%20template/img/sample/user7.png){kind=link}