Commits · 8477d50d2f88409d2e53752d1cb3affd8fa10404 · youjj / cloud-platform

23 Sep, 2019 9 commits

123 · 8477d50d
hezhen authored Sep 23, 2019

8477d50d

Merge branch 'master-modify-cutAmount' into dev · 8944baa5

jiaorz authored Sep 23, 2019

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.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/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

8944baa5

Merge branch 'master-modify-cutAmount' into dev · 60ed4609

jiaorz authored Sep 23, 2019

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.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/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

60ed4609

Merge branch 'master-modify-cutAmount' into dev · 19abf1f2

jiaorz authored Sep 23, 2019

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.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/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

19abf1f2

Merge branch 'master-modify-cutAmount' into dev · 2b29f5e7

jiaorz authored Sep 23, 2019

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.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/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

2b29f5e7

Merge branch 'master-modify-cutAmount' into dev · a6b94004

jiaorz authored Sep 23, 2019

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.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/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

a6b94004

Merge branch 'master-modify-cutAmount' into dev · dfdc711f

jiaorz authored Sep 23, 2019

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.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/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

dfdc711f

Merge branch 'master-modify-cutAmount' into dev · 40eebd85

jiaorz authored Sep 23, 2019

# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.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/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java

40eebd85

Merge branch 'master' into master-bug-0921 · e451116e
jiaorz authored Sep 23, 2019

e451116e

21 Sep, 2019 31 commits
- Merge branch 'master-modify-cutAmount' into dev · 341353bd
  jiaorz authored Sep 21, 2019
```
# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.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/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
```
  341353bd
- Merge branch 'dev' · d2cbffe2
  周健威 authored Sep 21, 2019
```
# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
```
  d2cbffe2
- Merge remote-tracking branch 'origin/dev' into dev · 4188859c
  周健威 authored Sep 21, 2019
  
  4188859c
- Merge branch 'master-modify-cutAmount' into dev · a5bd90a4
  周健威 authored Sep 21, 2019
  
  a5bd90a4
- 添加取消提示 · fc18f675
  周健威 authored Sep 21, 2019
  
  fc18f675
- 修复违约金读取问题 · dd3f7356
  周健威 authored Sep 21, 2019
  
  dd3f7356
- Merge remote-tracking branch 'origin/dev' into dev · b57d9142
  libin authored Sep 21, 2019
  
  b57d9142
- 小程序租车申请列表 · 34e6c75a
  libin authored Sep 21, 2019
  
  34e6c75a
- Merge remote-tracking branch 'origin/dev' into dev · 243436d4
  周健威 authored Sep 21, 2019
  
  243436d4
- Merge branch 'master-modify-cutAmount' into dev · ff786cb9
  周健威 authored Sep 21, 2019
  
  ff786cb9
- Merge remote-tracking branch 'origin/dev' into dev · 6d12fea3
  libin authored Sep 21, 2019
  
  6d12fea3
- 营地查询 · 65115b82
  libin authored Sep 21, 2019
  
  65115b82
- 修复违约金读取问题 · 9361ea8b
  周健威 authored Sep 21, 2019
  
  9361ea8b
- Merge remote-tracking branch 'origin/dev' into dev · 30e40e3c
  周健威 authored Sep 21, 2019
  
  30e40e3c
- Merge branch 'master-modify-cutAmount' into dev · bc319b69
  周健威 authored Sep 21, 2019
  
  bc319b69
- 修复问题 · 3aa3ae66
  周健威 authored Sep 21, 2019
  
  3aa3ae66
- Merge branch 'master-modify-cutAmount' into dev · fdc51239
  jiaorz authored Sep 21, 2019
```
# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.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/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
```
  fdc51239
- Merge remote-tracking branch 'origin/dev' into dev · 51f94ca6
  libin authored Sep 21, 2019
  
  51f94ca6
- 小程序车辆申请 · 84500c5d
  libin authored Sep 21, 2019
  
  84500c5d
- Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · 320a0040
  周健威 authored Sep 21, 2019
  
  320a0040
- 修复免费天数bug · a902f417
  周健威 authored Sep 21, 2019
  
  a902f417
- Merge remote-tracking branch 'origin/dev' into dev · fd753c38
  jiaorz authored Sep 21, 2019
  
  fd753c38
- Merge branch 'master-modify-cutAmount' into dev · 084a4bc6
  jiaorz authored Sep 21, 2019
  
  084a4bc6
- Merge branch 'master-modify-cutAmount' into dev · c7c686ec
  jiaorz authored Sep 21, 2019
```
# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.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/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
```
  c7c686ec
- 小程序车辆申请 · 5a9af981
  libin authored Sep 21, 2019
  
  5a9af981
- Merge remote-tracking branch 'origin/dev' into dev · 21d1793d
  libin authored Sep 21, 2019
  
  21d1793d
- 小程序车辆申请 · dc1bd2f8
  libin authored Sep 21, 2019
  
  dc1bd2f8
- Merge branch 'master-modify-cutAmount' into dev · faf72def
  jiaorz authored Sep 21, 2019
```
# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
```
  faf72def
- Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · c294a45b
  jiaorz authored Sep 21, 2019
  
  c294a45b
- Merge branch 'master-modify-cutAmount' into dev · 2d095128
  jiaorz authored Sep 21, 2019
```
# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.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/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
```
  2d095128
- Merge branch 'master-modify-cutAmount' into dev · d5daa7fc
  jiaorz authored Sep 21, 2019
```
# Conflicts:
#	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderPageVO.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/OrderVehicleCrosstownBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/inner/OrderCancelBiz.java
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BaseOrderController.java
```
  d5daa7fc