Merge branch 'master' into develop
modify RoleCastItemService
1.RoleEnemyCache修改
1.RoleFriendShipCache修改
1.bean序列化与反序列化实现
prop
Merge branch 'develop' of github.com:fredericky/45eb9e92911a4f into develop
Merge branch 'master' into develop
prop
Merge branch 'master' into develop
Merge branch 'master' of https://github.com/fredericky/45eb9e92911a4f into develop
complete cache,test not completed
1.排行榜功能
2.商城道具模版修改
fix bug
merge
test cache
merge conflict
merge conflict
merge
Merge branch 'develop' of github.com:fredericky/45eb9e92911a4f into develop