Skip to content

C
cloud-platform
Switch branch/tag
  1. 12 Dec, 2019 7 commits
  3. 11 Dec, 2019 6 commits
  5. 10 Dec, 2019 1 commit
  7. 04 Dec, 2019 3 commits
  9. 02 Dec, 2019 15 commits
  11. 29 Nov, 2019 8 commits
    • libin's avatar
      Merge remote-tracking branch 'origin/master' · c1129076
      libin authored
      c1129076
    • jiaorz's avatar
      Merge remote-tracking branch 'origin/master' · 8b1e1391
      jiaorz authored
      8b1e1391
    • libin's avatar
      Merge branch 'order_received_statistics' · 2505f6dd
      libin authored 
      # Conflicts:
#	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/OrderViolationBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderAccountMapper.java
      2505f6dd
    • jiaorz's avatar
      Merge branch 'master-vehicle-bug' · f05d9c4f
      jiaorz authored
      f05d9c4f
    • libin's avatar
      租车统计 · 9d57dcd7
      libin authored
      9d57dcd7
    • libin's avatar
      租车统计 · a68907dc
      libin authored
      a68907dc
    • hanfeng's avatar
      Merge remote-tracking branch 'origin/master' · 075c08ec
      hanfeng authored
      075c08ec
    • hanfeng's avatar
      Merge branch 'master-report-form' · e5cd74aa
      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
#	xx-order/xx-order-server/src/test/java/ServiceTest.java
      e5cd74aa