- 06 Jul, 2021 1 commit
-
-
刘继明 committed
-
- 01 Jul, 2021 1 commit
-
-
刘继明 committed
-
- 29 Jun, 2021 2 commits
-
-
Signed-off-by: 周晓航 <xiaohang.zhou@freemud.com>
周晓航 committed -
Merge branches 'featur/20210609-会员信息-zy' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
ping.wu committed
-
- 28 Jun, 2021 6 commits
-
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/service/coupon/impl/PlatformCouponRelationServiceImpl.java
王世昌 committed -
ping.wu committed
-
ping.wu committed
-
周晓航 committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
- 25 Jun, 2021 2 commits
- 24 Jun, 2021 18 commits
-
-
徐康 committed
-
徐康 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/service/impl/MCCafeOrderServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java
徐康 committed -
徐康 committed
-
Merge branches 'feature/20210618_优惠总金额回滚_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
Merge branches 'feature/20210618_优惠总金额回滚_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
徐康 committed
-
徐康 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
-
Merge remote-tracking branch 'origin/feature/xukang_20210609_麦咖啡p7v2' into feature/xukang_20210609_麦咖啡p7v2
徐康 committed -
徐康 committed
-
Merge branches 'featur/20210602-券码接口调整-zy' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
- 23 Jun, 2021 10 commits
