- -
Merge branch 'master' of
https://github.com/caining618/ytf_phone_server.git

Conflicts:
	src/main/java/com/yeepay/ytf/server/jgroups/impl/JGroupsOrderSysServiceImpl.java
	src/main/resources/com/yeepay/ytf/jgroups/ytf-clientService.xml
Merge branch 'master' of
https://github.com/caining618/ytf_phone_server.git

Conflicts:
	src/main/java/com/yeepay/ytf/server/jgroups/impl/JGroupsOrderSysServiceImpl.java