- 10 May, 2021 20 commits
-
-
# Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/request/OrderExtInfoDto.java
zhiheng.zhang committed -
# Conflicts: # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/controller/OrderController.java # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java # order-application-service/src/main/java/cn/freemud/service/Orderservice.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
zhiheng.zhang committed -
zhiheng.zhang committed
-
hanghang.wang committed
-
# Conflicts: # assortment-ordercenter-sdk/pom.xml # order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java # order-application-service/src/main/java/cn/freemud/controller/OrderController.java # order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java # order-application-service/src/main/java/cn/freemud/service/Orderservice.java # order-application-service/src/main/java/cn/freemud/service/delivery/ThirdDeliveryServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-management/pom.xml # shopping-cart-application-service/src/main/java/cn/freemud/enums/ResponseResult.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/calculate/CalculationSharingEquallyService.java
hanghang.wang committed -
zhiheng.zhang committed
-
王世昌 committed
-
王世昌 committed
-
Merge remote-tracking branch 'origin/feature/20210420-华莱士公用分支-张志恒' into feature/20210420-华莱士公用分支-张志恒
王世昌 committed -
王世昌 committed
-
王世昌 committed
-
hanghang.wang committed
-
zhiheng.zhang committed
-
王世昌 committed
-
王世昌 committed
-
zhiheng.zhang committed
-
王世昌 committed
-
王世昌 committed
-
王世昌 committed
-
王世昌 committed
-
- 08 May, 2021 4 commits
-
-
hanghang.wang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
- 07 May, 2021 16 commits
-
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
Merge branches 'feature/20210330_log.info修改_wuping' and 'feature/20210507_合并打印日志分支_wuping' of http://gitlab.freemud.com/order-group-application/order-group into feature/20210507_合并打印日志分支_wuping # Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/EncircleOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/MCCafeOrderServiceImpl.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # order-application-service/src/test/java/cn.freemud/client/MemberProductClientTest.java # order-application-service/src/test/java/cn.freemud/client/StockClientTest.java # order-application-service/src/test/java/cn.freemud/client/StoreClientTest.java # shopping-cart-application-service/src/main/java/cn/freemud/hystrix/MemberClientFallbackFactory.java # shopping-cart-application-service/src/main/java/cn/freemud/hystrix/ShortMessageClientFallbackFactory.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/BuriedPointServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/RecommendServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/StoreServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/ShoppingCartMCoffeeServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/mcoffee/calculation/CouponDiscountCalculation.java # shopping-cart-application-service/src/test/java/cn.freemud/client/MemberProductClientTest.java # shopping-cart-application-service/src/test/java/cn.freemud/client/PaymentClientTest.java # shopping-cart-application-service/src/test/java/cn.freemud/client/ShoppingCartClientTest.java # shopping-cart-application-service/src/test/java/cn.freemud/client/StoreClientTest.java # shopping-cart-application-service/src/test/java/cn.freemud/client/WeChatClientTest.java # shopping-cart-application-service/src/test/java/cn.freemud/service/ShoppingCartNewServiceTest.java # shopping-cart-application-service/src/test/java/cn.freemud/service/UserServiceTest.java
ping.wu committed -
ping.wu committed
-
王世昌 committed
-
王世昌 committed
-
Merge remote-tracking branch 'origin/feature/20210420-华莱士公用分支-张志恒' into feature/20210420-华莱士公用分支-张志恒
zhiheng.zhang committed -
zhiheng.zhang committed
-
zhiheng.zhang committed
-
hanghang.wang committed
-
hanghang.wang committed
-
hanghang.wang committed
-
hanghang.wang committed
-
