品尚
Merge branch '鍝佸皻' of https://github.com/lovevrlsq/zwg-china-iworld into 鍝佸皻

Conflicts:
	zwg-china.backstage.Web/ClientBin/zwg-china.backstage.xap
	zwg-china.client.Web/ClientBin/zwg-china.client.xap
主界面
Merge branch '鍝佸皻' of https://github.com/lovevrlsq/zwg-china-iworld into 鍝佸皻

Conflicts:
	zwg-china.backstage.Web/ClientBin/zwg-china.backstage.xap
	zwg-china.client.Web/ClientBin/zwg-china.client.xap
Merge branch '鍝佸皻' of https://github.com/lovevrlsq/zwg-china-iworld into 鍝佸皻

Conflicts:
	zwg-china.backstage.Web/ClientBin/zwg-china.backstage.xap
	zwg-china.client.Web/ClientBin/zwg-china.client.xap
	zwg-china.client/MainPage.xaml.cs
主界面
Merge branch '鍝佸皻' of https://github.com/lovevrlsq/zwg-china-iworld into 鍝佸皻

Conflicts:
	zwg-china.backstage.Web/ClientBin/zwg-china.backstage.xap
	zwg-china.client.Web/ClientBin/zwg-china.client.xap
选号界面
后台的VM完成
1
添加判断
Merge branch '鍝佸皻' of https://github.com/lovevrlsq/zwg-china-iworld into 鍝佸皻

Conflicts:
	zwg-china.backstage.Web/ClientBin/zwg-china.backstage.xap
	zwg-china.client.Web/ClientBin/zwg-china.client.xap
TableTool
修改后台的VM构造方法空置的bug
查看用户列表页基本完成（差筛选）
筛选控件基本完成
后台的用户管理全部OK
1、因为没有数据，暂时没有测试 登陆记录和帐变记录
2、以上界面留到前台组装完毕一起测试
后台增加用户的上级用户的显示
修改一些小bug
管理员模块的后台面板完成
系统设置的后台管理面板完成