增加新的分页标签
Merge branch 'master' of https://github.com/wayne0332/xiaojh.git

Conflicts:
	src/com/tjxjh/action/MerchantAction.java