- 18 May, 2021 3 commits
- 14 May, 2021 2 commits
- 10 May, 2021 2 commits
- 07 May, 2021 2 commits
-
-
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
-
- 30 Apr, 2021 1 commit
-
-
chongfu.liang committed
-
- 29 Apr, 2021 4 commits
- 28 Apr, 2021 1 commit
-
-
徐康 committed
-
- 26 Apr, 2021 6 commits
-
-
Merge branches 'feature/20210407_券码灰度修改_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group # Conflicts: # order-application-service/src/main/java/cn/freemud/service/impl/CheckMCCafeOrder.java # order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java # ordercenter-sdk/readme.md # shopping-cart-application-service/src/main/java/cn/freemud/service/impl/CouponServiceImpl.java # shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/ActivityClient.java # shopping-cart-application-service/src/main/java/cn/freemud/service/thirdparty/BigDataFeiginClient.java
ping.wu committed -
chongfu.liang committed
-
zhiheng.zhang committed
-
zhiheng.zhang committed
-
胡敬轩 committed
-
胡敬轩 committed
-
- 22 Apr, 2021 6 commits
-
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
chongfu.liang committed
-
chongfu.liang committed
-
- 21 Apr, 2021 8 commits
-
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
徐康 committed
-
chongfu.liang committed
-
chongfu.liang committed
-
chongfu.liang committed
-
- 20 Apr, 2021 5 commits
-
-
孙昱 committed
-
孙昱 committed
-
ping.wu committed
-
chongfu.liang committed
-
chongfu.liang committed
-
