- 17 Mar, 2021 2 commits
-
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/active/impl/PlatformActiveServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuyAndGiftsPromotionService.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/promotion/GiftSharingService.java
chongfu.liang committed -
徐康 committed
-
- 16 Mar, 2021 12 commits
-
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java
chongfu.liang committed -
chongfu.liang committed
-
Merge branch 'feature/20210316_小程序外卖单运单异常不取消配送单_wuping' of http://gitlab.freemud.com/order-group-application/order-group
ping.wu committed -
ping.wu committed
-
chongfu.liang committed
-
hanghang.wang committed
-
hanghang.wang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # assortment-shoppingcart-sdk/pom.xml # order-application-service/pom.xml # order-application-service/src/main/resources/application.properties # ordercenter-sdk/pom.xml # shopping-cart-application-service/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/CartGoods.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/AssortmentSdkService.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java
hanghang.wang committed -
chongfu.liang committed
-
- 15 Mar, 2021 18 commits
-
-
hanghang.wang committed
-
# Conflicts: # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/ShoppingCartNewServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingDiscountService.java
chongfu.liang committed -
chongfu.liang committed
-
hanghang.wang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
chongfu.liang committed
-
hanghang.wang committed
-
chongfu.liang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
- 13 Mar, 2021 8 commits
-
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
ping.wu committed
-
chongfu.liang committed
-
