前端页面
Merge branch 'master' of https://github.com/dongjiehui/djh

Conflicts:
	src/main/java/cn/chiv/entity/LiveAbroad.java
Merge branch 'master' of https://github.com/dongjiehui/djh

Conflicts:
	src/main/java/cn/chiv/entity/Group.java
	src/main/java/cn/chiv/entity/LiveAbroad.java
	src/main/java/cn/chiv/entity/Role.java
	src/main/java/cn/chiv/entity/User.java