1. 09 Dec, 2020 2 commits
    • Merge branch 'feature/2.0.1-collageOrder-刘鹏飞' into feature/20201208_collageOrder_miaohui · 383c6979
      # Conflicts:
      #	assortment-ordercenter-sdk/pom.xml
      #	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/adapter/OrderSdkAdapter.java
      #	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/BaseCreateOrderRequest.java
      #	assortment-ordercenter-sdk/src/main/java/com/freemud/sdk/api/assortment/order/request/order/CreateOrderProductRequest.java
      #	assortment-shoppingcart-sdk/src/main/java/com/freemud/sdk/api/assortment/shoppingcart/constant/ShoppingCartConstant.java
      #	order-application-service/pom.xml
      #	order-application-service/src/main/java/cn/freemud/enums/ResponseResult.java
      #	order-application-service/src/main/java/cn/freemud/service/impl/CheckOrder.java
      #	order-application-service/src/main/java/cn/freemud/service/thirdparty/WeChatClient.java
      #	shopping-cart-application-service/src/main/java/cn/freemud/entities/dto/ActivityCalculationDiscountResponseDto.java
      #	shopping-cart-application-service/src/main/java/cn/freemud/entities/vo/ShoppingCartGoodsResponseVo.java
      缪晖 committed
  2. 08 Dec, 2020 4 commits
  3. 07 Dec, 2020 10 commits
  4. 05 Dec, 2020 5 commits
  5. 04 Dec, 2020 4 commits
  6. 03 Dec, 2020 3 commits
  7. 02 Dec, 2020 4 commits
  8. 01 Dec, 2020 8 commits