Commits · 2bc32632794027495d0eb659ba586407ad02db00 · youjj / cloud-platform

07 May, 2020 5 commits
- Merge branch 'master-vehicle-memeber' into dev · 2bc32632
  jiaorz authored May 07, 2020
  
  2bc32632
- 会员类型添加 · e6d6363f
  jiaorz authored May 07, 2020
  
  e6d6363f
- 会员类型添加 · 7d32fbbd
  jiaorz authored May 07, 2020
  
  7d32fbbd
- Merge branch 'master-vehicle-memeber' into dev · c8f40d73
  jiaorz authored May 07, 2020
  
  c8f40d73
- 租车筛选 · 5880acec
  jiaorz authored May 07, 2020
  
  5880acec
24 Apr, 2020 3 commits
- Merge branch 'master-rentvehicle' · 4842a567
  jiaorz authored Apr 24, 2020
  
  4842a567
- Merge branch 'master-rentvehicle' into dev · 6ff37f0e
  jiaorz authored Apr 24, 2020
  
  6ff37f0e
- 租车筛选 · b4b3a740
  jiaorz authored Apr 24, 2020
  
  b4b3a740
23 Apr, 2020 6 commits
- Merge branch 'master-order' · c0e2b1d0
  jiaorz authored Apr 23, 2020
  
  c0e2b1d0
- Merge branch 'master-order' into dev · e6d81eed
  jiaorz authored Apr 23, 2020
  
  e6d81eed
- 订单库存bug · 1dbfeb93
  jiaorz authored Apr 23, 2020
  
  1dbfeb93
- Merge branch 'master-order' into dev · eacf42c7
  jiaorz authored Apr 23, 2020
  
  eacf42c7
- 订单库存bug · 1ea4b7e6
  jiaorz authored Apr 23, 2020
  
  1ea4b7e6
- Merge branch 'master-order' · 89ae3285
  jiaorz authored Apr 23, 2020
  
  89ae3285
22 Apr, 2020 2 commits
- Merge branch 'master-order' into dev · 1b767bcf
  jiaorz authored Apr 22, 2020
  
  1b767bcf
- 订单库存bug · 2c40773b
  jiaorz authored Apr 22, 2020
  
  2c40773b
21 Apr, 2020 8 commits
- Merge branch 'master-order' into dev · a6732967
  jiaorz authored Apr 21, 2020
  
  a6732967
- 订单详情修改 · fc7b66fb
  jiaorz authored Apr 21, 2020
  
  fc7b66fb
- Merge branch 'master-order' into dev · beae6513
  jiaorz authored Apr 21, 2020
  
  beae6513
- 订单详情修改 · 50c6beeb
  jiaorz authored Apr 21, 2020
  
  50c6beeb
- Merge branch 'master-order' into dev · 24388b2e
  jiaorz authored Apr 21, 2020
  
  24388b2e
- 订单详情修改 · 1a921387
  jiaorz authored Apr 21, 2020
  
  1a921387
- Merge branch 'master-order' into dev · 0e4cfadb
  jiaorz authored Apr 21, 2020
  
  0e4cfadb
- 订单详情修改 · a90979ba
  jiaorz authored Apr 21, 2020
  
  a90979ba
20 Apr, 2020 10 commits
- Merge branch 'master-order' into dev · 6e84cc81
  jiaorz authored Apr 20, 2020
  
  6e84cc81
- 订单详情修改 · 43eb6bb8
  jiaorz authored Apr 20, 2020
  
  43eb6bb8
- Merge branch 'master-order' into dev · 178de8a1
  jiaorz authored Apr 20, 2020
  
  178de8a1
- 订单详情修改 · ed31d5f9
  jiaorz authored Apr 20, 2020
  
  ed31d5f9
- Merge branch 'master-order' into dev · 385fb880
  jiaorz authored Apr 20, 2020
```
# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/vo/OrderActivityVo.java
```
  385fb880
- 订单详情修改 · e77675dd
  jiaorz authored Apr 20, 2020
  
  e77675dd
- 订单详情修改 · 18f1fddb
  jiaorz authored Apr 20, 2020
  
  18f1fddb
- 订单详情修改 · 3aa0c264
  jiaorz authored Apr 20, 2020
  
  3aa0c264
- Merge branch 'master-order' into dev · 3c2374b1
  jiaorz authored Apr 20, 2020
  
  3c2374b1
- 订单详情修改 · e666d5b3
  jiaorz authored Apr 20, 2020
  
  e666d5b3
18 Apr, 2020 6 commits
- Merge branch 'master-order' into dev · 365598d9
  jiaorz authored Apr 18, 2020
  
  365598d9
- 用户订单列表修改 · d387408e
  jiaorz authored Apr 18, 2020
  
  d387408e
- Merge branch 'master-order' into dev · e3d0d6fc
  jiaorz authored Apr 18, 2020
  
  e3d0d6fc
- 用户订单列表修改 · e940fb10
  jiaorz authored Apr 18, 2020
  
  e940fb10
- Merge branch 'master-order' into dev · 568927b3
  jiaorz authored Apr 18, 2020
  
  568927b3
- 用户订单列表修改 · 54e6d137
  jiaorz authored Apr 18, 2020
  
  54e6d137