ufo / yohoufo-fore · Commits

# Conflicts:
#	order/src/main/java/com/yohoufo/order/controller/SellerOrderController.java
#	order/src/main/java/com/yohoufo/order/service/SellerOrderService.java

* 'dev' of http://git.yoho.cn/ufo/yohoufo-fore:
  add definition