Signed-off-by: okaywang <okaywang@qq.com>
Merge branch 'master' of https://github.com/PublicAccount0509/ArtSource

Conflicts:
	Presentation/Art.WebService/Web.config
	Presentation/Art.Website/Web.config
Merge branch 'master' of https://github.com/PublicAccount0509/ArtSource

Conflicts:
	Presentation/Art.WebService/Web.config
	Presentation/Art.Website/Web.config

Signed-off-by: okaywang <okaywang@qq.com>
Signed-off-by: okaywang <okaywang@qq.com>
Merge branch 'master' of https://github.com/PublicAccount0509/ArtSource

Conflicts:
	BussinessLogic/Art.BussinessLogic/ArtworkBussinessLogic.cs
	Presentation/Art.WebService/Art.WebService.csproj
	Presentation/Art.WebService/Controllers/ArtworkController.cs

Signed-off-by: okaywang <okaywang@qq.com>