-
# Conflicts: # order/src/main/java/com/yohoufo/order/controller/InviteSettlementController.java # order/src/main/java/com/yohoufo/order/service/IInviteSettlementService.java # order/src/main/java/com/yohoufo/order/service/impl/InviteSettlementServiceImpl.java
-
# Conflicts: # order/src/main/java/com/yohoufo/order/service/impl/InviterSettleService.java
-
# 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
-
在微信中显示对应商品的小程序码 See merge request !2
-
Conflicts: order/src/main/java/com/yohoufo/order/service/proxy/UserProxyService.java
