Signed-off-by: ritacc <ritacc@126.com>
Merge branch 'master' of github.com:ritacc/QueueClient
Signed-off-by: ritacc <ritacc@126.com>
Merge branch 'master' of github.com:ritacc/QueueClient

Conflicts:
	QSoft/Core/ViewModel/MainViewModel.cs
	queueclient.sql

Signed-off-by: ritacc <ritacc@126.com>