Merge branch 'master' of E:\MyShop with conflicts.
赵翠翠--
Merge remote-tracking branch 'origin/master'
赵翠翠
赵翠翠
赵翠翠--xml文件修改
赵翠翠--xml
Merge branch 'master' of E:\dazuoye\MyShop with conflicts.
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/hzjxy/myshop/dao/GoodsMapper.xml
Merge remote-tracking branch 'origin/master'
邵亚楠
Merge remote-tracking branch 'origin/master'

Conflicts:
	src/net/hzjxy/myshop/dao/GoodsTypeMapper.xml