- 16 Jun, 2021 28 commits
-
-
张跃 committed
-
张跃 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/demo/entities/bo/goods/ShoppingCartGoodsApportionBO.java # shopping-cart-application-service/src/main/java/cn/freemud/demo/service/impl/PlatformApportionService.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartMallServiceImpl.java
周晓航 committed -
张跃 committed
-
# Conflicts: # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java # order-application-service/src/main/java/cn/freemud/adapter/CreateOrderAdapter.java
周晓航 committed -
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java # order-application-service/src/main/java/cn/freemud/entities/dto/delivery/CallbackUrlRequestDto.java
周晓航 committed -
徐康 committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
zhangzhiheng committed
-
zhangzhiheng committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java
周晓航 committed -
徐康 committed
-
Merge remote-tracking branch 'origin/feature/xukang_20210609_麦咖啡p7v2' into feature/xukang_20210609_麦咖啡p7v2
徐康 committed -
徐康 committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
zhangzhiheng committed
-
徐康 committed
-
徐康 committed
-
zhangzhiheng committed
-
zhangzhiheng committed
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
zhangzhiheng committed
-
- 15 Jun, 2021 12 commits
