1. 01 Jun, 2021 2 commits
  2. 19 May, 2021 1 commit
  3. 18 May, 2021 3 commits
  4. 14 May, 2021 2 commits
  5. 10 May, 2021 2 commits
  6. 07 May, 2021 2 commits
    • Merge branches 'feature/20210330_log.info修改_wuping' and… · 467cb1f3
      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
  7. 30 Apr, 2021 1 commit
  8. 29 Apr, 2021 4 commits
  9. 28 Apr, 2021 1 commit
  10. 26 Apr, 2021 6 commits
  11. 22 Apr, 2021 6 commits
  12. 21 Apr, 2021 8 commits
  13. 20 Apr, 2021 2 commits