宋磊
Merge remote-tracking branch 'origin/master'

Conflicts:
	.idea/dataSources.xml
	src/net/hzjxy/myshop/dao/ArticleCategoryMapper.xml