recreate hibernate entity
remove other usercase for compile error
Merge branch 'master' of https://github.com/boringkiller/bit.git

Conflicts:
	bitb-biz/src/main/java/com/bit/bitb/biz/service/TradeService.java
	bitb-biz/src/main/java/com/bit/bitb/biz/service/impl/TradeServiceImpl.java