phpstorm卡在了mysqli上
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/dataSources.xml
	function.php
	setting.php
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/dataSources.xml
	function.php
	setting.php