Conflicts: src/main/java/com/senthink/rmi/challenger/rmi/EllaUserBaseHystrix.java src/main/java/com/senthink/rmi/challenger/rmi/EllaUserBaseRemoteService.java src/main/java/com/senthink/rmi/challenger/vo/EllaUserBaseVo.java
