1. 10 Jun, 2020 1 commit
    • Merge branches 'feature/20200522_买券订单创建_wuping' and 'master' of… · f02dd0c0
      Merge branches 'feature/20200522_买券订单创建_wuping' and 'master' of http://gitlab.freemud.com/order-group-application/order-group
      
      # Conflicts:
      #	assortment-ordercenter-sdk/pom.xml
      #	assortment-ordercenter-sdk/readme.md
      #	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/response/order/QueryOrdersResponse.java
      #	order-application-service/pom.xml
      #	order-application-service/src/main/java/cn/freemud/adapter/OrderAdapter.java
      #	order-application-service/src/main/java/cn/freemud/service/impl/OrderServiceImpl.java
      #	ordercenter-sdk/pom.xml
      #	ordercenter-sdk/readme.md
      #	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/constant/InterfaceAddressConstant.java
      #	ordercenter-sdk/src/main/java/com/freemud/application/sdk/api/ordercenter/service/OrderSdkService.java
      ping.wu committed
  2. 09 Jun, 2020 1 commit
  3. 08 Jun, 2020 18 commits
  4. 05 Jun, 2020 8 commits
  5. 03 Jun, 2020 2 commits
  6. 02 Jun, 2020 7 commits
  7. 01 Jun, 2020 3 commits