-
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
-
# Conflicts: # common/yohoufo-fore-common.iml # dal/src/main/java/com/yohoufo/dal/order/SellerOrderMapper.java # dal/src/main/resources/META-INF/mybatis/order/SellerOrderGoodsMapper.xml # order/yohoufo-fore-order.iml # payment/yohoufo-fore-payment.iml
-
# Conflicts: # order/yohoufo-fore-order.iml # payment/yohoufo-fore-payment.iml
-
Conflicts: product/yohoufo-fore-product.iml
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/SellerOrderService.java
-
# Conflicts: # web/src/main/resources/META-INF/spring/spring-web-context.xml
-
* 'master' of http://git.yoho.cn/ufo/yohoufo-fore: 修改项目打包名称
