加
Merge branch 'master' of https://github.com/xinmifeng/iBus_back

Conflicts:
	sqlDb.php