品牌的修改

Signed-off-by: chen da <sdywcd@gmail.com>
Merge remote-tracking branch 'origin/master'

Conflicts:
	ROOT/WebContent/admin/js/brands/brandsmentjs.js