ufo / yohoufo-fore · Commits

* 'master' of http://git.yoho.cn/ufo/yohoufo-fore:
  add some new
  订单号生成
  订单号生成

* 'master' of http://git.yoho.cn/ufo/yohoufo-fore:
  add some new
  订单号生成
  订单号生成

# Conflicts:
#	common/src/main/java/com/yohoufo/common/caller/UfoServiceCaller.java

# Conflicts:
#	common/yohoufo-fore-common.iml
#	dal/yohoufo-fore-dal.iml
#	order/yohoufo-fore-order.iml
#	payment/yohoufo-fore-payment.iml
#	product/yohoufo-fore-product.iml

Conflicts:
	common/yohoufo-fore-common.iml
	order/yohoufo-fore-order.iml
	payment/yohoufo-fore-payment.iml

# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/ShoppingServiceImpl.java

Conflicts:
	dal/yohoufo-fore-dal.iml
	order/yohoufo-fore-order.iml
	payment/yohoufo-fore-payment.iml
	product/yohoufo-fore-product.iml

# Conflicts:
#	common/yohoufo-fore-common.iml
#	order/yohoufo-fore-order.iml
#	payment/yohoufo-fore-payment.iml