Skip to content

C
cloud-platform
Switch branch/tag
  1. 18 Nov, 2019 4 commits
  3. 15 Nov, 2019 1 commit
  5. 14 Nov, 2019 6 commits
  7. 13 Nov, 2019 1 commit
  9. 12 Nov, 2019 17 commits
  11. 11 Nov, 2019 11 commits
    • hanfeng's avatar
      Merge remote-tracking branch 'origin/master' · 436702b8
      hanfeng authored
      436702b8
    • hanfeng's avatar
      Merge branch 'master-modify-background-bug-hf' · cd35fd25
      hanfeng authored
      cd35fd25
    • hanfeng's avatar
      修改车辆信息 · 83fbd9b9
      hanfeng authored
      83fbd9b9
    • 周健威's avatar
      添加接口 · b14a8da4
      周健威 authored
      b14a8da4
    • 周健威's avatar
      添加接口 · a176be33
      周健威 authored
      a176be33
    • 周健威's avatar
      修改退第一笔押金bug · b7233ef0
      周健威 authored
      b7233ef0
    • jiaorz's avatar
      Merge remote-tracking branch 'origin/master' · 82b45c62
      jiaorz authored 
      # Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
      82b45c62
    • jiaorz's avatar
      Merge branch 'master-modify-background-bug-hf' · af458fb5
      jiaorz authored 
      # Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
      af458fb5
    • jiaorz's avatar
      Merge branch 'master_pays' · 10367486
      jiaorz authored
      10367486
    • jiaorz's avatar
      Merge branch 'master-modify-background-bug-hf' · 6bb62c4c
      jiaorz authored 
      # Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderVehicleCrosstownDto.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
      6bb62c4c
    • hanfeng's avatar
      Merge branch 'master-modify-background-bug-hf' · a3e398f1
      hanfeng authored 
      # Conflicts:
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
#	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderVehicleCrosstownDto.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
      a3e398f1