5
6
Merge branch 'master' of https://github.com/lovevrlsq/Client
6
Merge branch 'master' of https://github.com/lovevrlsq/Client
7
Merge branch 'master' of https://github.com/lovevrlsq/Client

Conflicts:
	Client.sln
	ToClient.Web/ToClient.Web.csproj
	ToClient.Web/Web.config
	ToClient/ServiceReferences.ClientConfig
	ToClient/ToClient.csproj
Merge branch 'master' of https://github.com/lovevrlsq/Client
7
...
8
10
Merge branch 'master' of https://github.com/lovevrlsq/Client
11
Merge branch 'master' of https://github.com/lovevrlsq/Client

Conflicts:
	ToClient/Service References/MessageService/Reference.cs
Merge branch 'master' of https://github.com/lovevrlsq/Client

Conflicts:
	Client.CustomerService.Framework/IndexViewModel.cs
12
给客户端插件添加服务引用