Struts2框架之DOJO标签
Merge branch 'master' of https://github.com/lzybj/bdqny2

Conflicts:

my1004/WebRoot/WEB-INF/classes/com/lzybj/hibernate/service/SmsService.cl
ass

my1004/WebRoot/WEB-INF/classes/com/lzybj/hibernate/service/SmsUsersServi
ce.class
	my1004/WebRoot/WEB-INF/classes/struts.xml
	my1004/src/com/lzybj/hibernate/service/SmsService.java