添加bar map图标
Merge remote-tracking branch 'origin/branch_1.1.0' into branch_1.1.0

Conflicts:
	designer/src/main/resources/public/silkroad/src/report/component-box/components/select-vm-template.html
添加bar map图标
Merge remote-tracking branch 'origin/branch_1.1.0' into branch_1.1.0