Merge pull request #1 from hehe04/master

Master->develop
Merge pull request #1 from hehe04/master

Master->develop
Template
Merge branch 'develop' of https://github.com/hehe04/ZdtbSite into develop
committed
Merge branch 'develop' of https://github.com/hehe04/ZdtbSite into develop
添加model
Merge branch 'develop' of https://github.com/hehe04/ZdtbSite into develop
modify
modify
modify
修改html模板
Merge branch 'develop' of github.com:hehe04/ZdtbSite into develop
Merge branch 'develop' of https://github.com/hehe04/ZdtbSite into develop
Merge branch 'develop' of https://github.com/hehe04/ZdtbSite into develop

Conflicts:
	src/ZdtbSite.Core/Infrastructure/DataContext.cs
	src/ZdtbSite.Core/Infrastructure/IRepository.cs
	src/ZdtbSite.Model/ZdtbSite.Model.csproj
解决冲突
modify
modify
mysql数据库字段 类型为longtext
Merge remote-tracking branch 'zs/jiangdev' into develop2