Skip to content

C
cloud-platform
Switch branch/tag
  1. 28 Nov, 2019 6 commits
    • jiaorz's avatar
      Merge remote-tracking branch 'origin/dev' into dev · 5c6c7ab5
      jiaorz authored 
      # Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
      5c6c7ab5
    • jiaorz's avatar
      Merge branch 'feature-delay-add' into dev · db5593d3
      jiaorz authored 
      # Conflicts:
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
      db5593d3
    • jiaorz's avatar
      新增获取视频列表 · 5bcbb36d
      jiaorz authored
      5bcbb36d
    • hanfeng's avatar
      Merge remote-tracking branch 'origin/dev' into dev · bf5dcdd5
      hanfeng 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/biz/OrderAccountBiz.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
      bf5dcdd5
    • hanfeng's avatar
      Merge branch 'master-report-form' into dev · 5feafb03
      hanfeng 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
      5feafb03
    • hanfeng's avatar
      总业绩统计 · 75c22dd8
      hanfeng authored
      75c22dd8
  3. 27 Nov, 2019 34 commits