Authored by caoyan

Merge branch 'test6.9.7' of http://git.yoho.cn/ufo/ufo-platform into test6.9.7

# Conflicts:
#	order/src/main/java/com/yoho/ufo/order/service/IBuyerOrderService.java
#	order/src/main/java/com/yoho/ufo/order/service/impl/BuyerOrderServiceImpl.java
Showing 0 changed files with 0 additions and 0 deletions