Merge origin/dev into dev

Conflicts:
	wifi-main/logs/biwifi.log
1、修改实体
2、增加会员分类相关
3、修正测试 sql
Merge origin/dev into dev

Conflicts:
	wifi-main/src/main/resources/sql/h2.sql