-
# Conflicts: # order/src/main/java/com/yohoufo/order/controller/InviteSettlementController.java # order/src/main/java/com/yohoufo/order/service/impl/InviteSettlementItemCreator.java # order/src/main/java/com/yohoufo/order/service/impl/InviteSettlementServiceImpl.java
-
# Conflicts: # dal/src/main/resources/META-INF/mybatis/product/SecondhandImagesMapper.xml
-
Conflicts: pom.xml
-
…o hotfix-invite-activity # Conflicts: # dal/src/main/java/com/yohoufo/dal/order/InviteRecordMapper.java # dal/src/main/java/com/yohoufo/dal/order/InviteSettlementItemMapper.java # dal/src/main/java/com/yohoufo/dal/order/model/InviteRecord.java # dal/src/main/java/com/yohoufo/dal/order/model/InviteSettlementItem.java # dal/src/main/java/com/yohoufo/dal/order/model/Inviter.java # dal/src/main/resources/META-INF/mybatis/order/InviteRecordMapper.xml # dal/src/main/resources/META-INF/mybatis/order/InviteSettlementItemMapper.xml # dal/src/main/resources/META-INF/mybatis/order/InviterMapper.xml