1、添加用户组相关文件
Merge origin/dev into dev

Conflicts:
	wifi-main/logs/biwifi.log
Merge origin/dev into dev

Conflicts:
	wifi-main/logs/biwifi.log