更新代码
test
Merge branch 'master' of ssh://git@github.com/lestchun/fbbs.git

Conflicts:
	WebRoot/WEB-INF/bbs/listSBBs.jsp
	WebRoot/WEB-INF/classes/com/pbbs/action/BaseAction.class
	WebRoot/WEB-INF/classes/com/pbbs/action/BbsAction.class
	WebRoot/WEB-INF/classes/com/pbbs/action/MassAction.class
	WebRoot/WEB-INF/classes/com/pbbs/action/MessageAction.class
	WebRoot/WEB-INF/classes/com/pbbs/action/ModulAction.class
	WebRoot/WEB-INF/classes/com/pbbs/action/UserAction.class
	WebRoot/WEB-INF/classes/com/pbbs/action/UserMassAction.class
	WebRoot/WEB-INF/classes/com/pbbs/action/VisiablelyAction.class
	WebRoot/WEB-INF/classes/com/pbbs/dao/BbsDao.class
	WebRoot/WEB-INF/classes/com/pbbs/dao/UserDao.class
	WebRoot/WEB-INF/classes/com/pbbs/dao/UserMassDao.class
	WebRoot/WEB-INF/classes/com/pbbs/dao/impl/BaseDao.class
	WebRoot/WEB-INF/classes/com/pbbs/dao/impl/BbsDaoImpl.class
	WebRoot/WEB-INF/classes/com/pbbs/dao/impl/UserDaoImpl.class
	WebRoot/WEB-INF/classes/com/pbbs/dao/impl/UserMassDaoImpl.class
	WebRoot/WEB-INF/classes/com/pbbs/model/Bbs.class
	WebRoot/WEB-INF/classes/com/pbbs/model/Mass.class
	WebRoot/WEB-INF/classes/com/pbbs/model/Modul.class
	WebRoot/WEB-INF/classes/com/pbbs/model/User.class
	WebRoot/WEB-INF/classes/com/pbbs/model/UserMass.class
	WebRoot/WEB-INF/classes/com/pbbs/service/BbsService.class
	WebRoot/WEB-INF/classes/com/pbbs/service/UserService.class
	WebRoot/WEB-INF/classes/com/pbbs/service/VisiablelyService.class
	WebRoot/WEB-INF/classes/com/pbbs/service/impl/BbsServiceImpl.class
	WebRoot/WEB-INF/classes/com/pbbs/service/impl/UserServiceImpl.class
	WebRoot/WEB-INF/classes/com/pbbs/service/impl/VisiablelyServiceImpl.class
	WebRoot/WEB-INF/classes/struts.xml
	WebRoot/WEB-INF/persion/index.jsp
	WebRoot/jsp/info.jsp
	src/com/pbbs/action/BbsAction.java
	src/com/pbbs/action/MassAction.java
	src/com/pbbs/action/ModulAction.java
	src/com/pbbs/action/UserAction.java
	src/com/pbbs/action/UserMassAction.java
	src/com/pbbs/dao/BbsDao.java
	src/com/pbbs/dao/UserMassDao.java
	src/com/pbbs/dao/impl/BbsDaoImpl.java
	src/com/pbbs/dao/impl/UserMassDaoImpl.java
	src/com/pbbs/service/BbsService.java
	src/com/pbbs/service/impl/BbsServiceImpl.java
	src/struts.xml
改了冲突

Signed-off-by: lestchun <135495588@163.com>