-
# Conflicts: # order/src/main/java/com/yohoufo/order/constants/MetaKey.java
-
# Conflicts: # web/src/main/resources/databases.yml
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/SellerOrderService.java # product/src/main/java/com/yohoufo/product/controller/ProductController.java
-
* 'master' of http://git.yoho.cn/ufo/yohoufo-fore: add some new 订单号生成 订单号生成 * 'master' of http://git.yoho.cn/ufo/yohoufo-fore: add some new 订单号生成 订单号生成
