fix weapon query issue
Merge branch 'master' of
https://github.com/scorpiopapa/game-hollychains.git

Conflicts:
	holly-chains-admin/src/main/java/com/joinway/admin/bean/domain/Weapon.java