增加活动置顶和修改产品BUG
edit

edit product
log4net
Merge branch 'v1'
v2 update
merge
Merge branch 'v2start'
v2 merge master
bulk add
Merge branch 'master' of https://github.com/victorgong/ytoo.service

Conflicts:
	Yintai.Hangzhou.Data/Models/YintaiHangzhouContext.cs
	Yintai.Hangzhou.Data/Models/YintaiHzhouContext.cs
	Yintai.Hangzhou.Service/Impl/ResourceService.cs
	Yintai.Hangzhou.Service/Manager/FileUploadServiceManager.cs