-
# Conflicts: # dal/src/main/java/com/yohoufo/dal/order/TradeBillsMapper.java # dal/src/main/java/com/yohoufo/dal/order/model/TradeBills.java # dal/src/main/resources/META-INF/mybatis/order/TradeBillsMapper.xml # order/src/main/java/com/yohoufo/order/service/impl/PaymentServiceImpl.java
-
add inbox msg facade use optimized lock 2 update seller order status
-
# 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
-
change package