sql-7-31
TT
Merge branch 'master' of https://github.com/wayne0332/xiaojh.git
忽略hibernate配置文件
8-1数据库添加广告表   fineTu
Merge branch 'master' of https://github.com/wayne0332/xiaojh.git
3306 root root
Merge branch 'master' of https://github.com/wayne0332/xiaojh.git
advertisement 表更新
忽略listener
Merge pull request #5 from CacheCake/master

userHome
test ignore
clean
test
update project
Merge branch 'master' of https://github.com/wayne0332/xiaojh into wayne0332-master

Conflicts:
	WebRoot/WEB-INF/classes/com/tjxjh/action/ActivityAction.class
	WebRoot/WEB-INF/classes/com/tjxjh/service/ActivityService.class
	WebRoot/WEB-INF/classes/com/tjxjh/service/ClubNewsService.class
	WebRoot/WEB-INF/classes/com/tjxjh/service/OnlineActivityService.class
	WebRoot/WEB-INF/classes/struts.xml
	src/hibernate.cfg.xml