后台业务逻辑提交，layer插件添加！
Merge branch 'wjs0829'

Conflicts:
	src/main/java/com/freetech/official/entity/User.java