修改了商品类型及参数的设置功能
Merge remote-tracking branch 'origin/master'

Conflicts:
	ROOT/WebContent/WEB-INF/classes/com/jshop/action/backstage/goods/GoodsTypeTNAction.class
	ROOT/WebContent/admin/js/goods/goodstypetnmentjs.js
	ROOT/src/com/jshop/action/backstage/goods/GoodsTypeTNAction.java

Signed-off-by: chen da <sdywcd@gmail.com>