完善图标功能
Merge origin/master

Conflicts:
	admin/controllers/data.php
	admin/models/equip_model.php
	admin/views/equip/reg_new.php