goods
add
add
fixed
fixed
Merge branch 'master' of https://github.com/focalhot/etool.git

Conflicts:
	protected/views/goods/index.php