ufo / yohoufo-fore · Commits

# Conflicts:
#	order/src/main/java/com/yohoufo/order/service/impl/SellerOrderListService.java
#	order/src/main/java/com/yohoufo/order/utils/OrderAssist.java

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

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

# Conflicts:
#	web/src/main/resources/databases.yml
#	web/src/main/webapp/META-INF/autoconf/databases.yml