You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
土豆兄弟 9fcfffb85a Merge branch 'master' of http://git.hchbox.com/yuyou/client into master
# Conflicts:
#	src/main/java/com/yuyou/openapi/openapi/model/convert/ABMessageConverter.java
#	src/main/java/com/yuyou/openapi/openapi/model/dataobject/ABMessageDO.java
#	src/main/java/com/yuyou/openapi/openapi/service/impl/ABClientServiceImpl.java
4 years ago
..
main Merge branch 'master' of http://git.hchbox.com/yuyou/client into master 4 years ago
test/java/com/yuyou/openapi/openapi Merge branch 'master' of http://git.hchbox.com/yuyou/client into master 4 years ago