Skip to content

C
cloud-platform
Switch branch/tag
  1. 02 Dec, 2019 2 commits
    • 周健威's avatar
      Merge branch 'feature-delay-add' into dev · 4fe10d0e
      周健威 authored 
      # Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderAccountMapper.java
#	xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
      4fe10d0e
    • 周健威's avatar
      Merge branch 'master' into feature-delay-add · 71e58452
      周健威 authored 
      # Conflicts:
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
      71e58452
  3. 30 Nov, 2019 6 commits
  5. 29 Nov, 2019 32 commits