sdfasd
Merge branch 'master' of https://github.com/weizijunxqy/test
Merge branch 'master' of https://github.com/weizijunxqy/test
ccsdfa
Merge branch 'master' of https://github.com/weizijunxqy/test

Conflicts:
	QueryDao.cpp