change the main.html,i donn't konw what happen,i just pull the dzaq
Merge branch 'dzaq', remote-tracking branch 'origin'
Merge branch 'dzaq', remote-tracking branch 'origin' into john
Merge branch 'master' of github.com:BiaoPro/community
Merge branch 'master' into john
resovle newsManager failed
ok
Merge branch 'master' of https://github.com/BiaoPro/community
添加后台管理页面的登陆验证，未登陆直接跳转到登陆页面
添加用户初始化，默认有admin/sys back/123 test/123 账号
增加了用户管理文章功能
增加用户管理文章功能
change the works
Merge branch 'master' of github.com:BiaoPro/community
增加信息反馈模块功能后台和前端页面
Merge branch 'master' of https://github.com/BiaoPro/community
修改部分代码
修改Houses.java登陆验证
Merge branch 'master' of https://github.com/BiaoPro/community
修改houses/base.html extends 路径