Commits · ff786cb9388f1933fb842b36c1f7defb489b9db7 · youjj / cloud-platform

21 Sep, 2019 34 commits

Merge branch 'master-modify-cutAmount' into dev · ff786cb9
周健威 authored Sep 21, 2019

ff786cb9
修复违约金读取问题 · 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 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

Merge branch 'master-modify-cutAmount' into dev · 8b3cb93a

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

8b3cb93a

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

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

b6d443b8

Merge branch 'master-modify-cutAmount' into dev · 5f9a3a18

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

5f9a3a18

Merge branch 'master-modify-cutAmount' into dev · 7dbad04a

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

7dbad04a

Merge branch 'master-modify-cutAmount' into dev · 29e51147

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

29e51147

Merge remote-tracking branch 'origin/dev' into dev · 2c7df08c
jiaorz authored Sep 21, 2019

2c7df08c

Merge branch 'master-modify-cutAmount' into dev · 1198df2a

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

1198df2a

Merge remote-tracking branch 'origin/dev' into dev · a4ed04cc
周健威 authored Sep 21, 2019

a4ed04cc
Merge branch 'master-modify-cutAmount' into dev · 47ed6ce9
周健威 authored Sep 21, 2019

47ed6ce9
修复退款bug · 18048456
周健威 authored Sep 21, 2019

18048456
Merge remote-tracking branch 'origin/dev' into dev · 913107af
libin authored Sep 21, 2019

913107af
小程序分公司接口查询 · 3cab8ab9
libin authored Sep 21, 2019

3cab8ab9
小程序分公司接口查询 · 9bc7f0dc
libin authored Sep 21, 2019

9bc7f0dc
Merge branch 'master-modify-cutAmount' into dev · 8020fd61
周健威 authored Sep 21, 2019

8020fd61
修改代码 · 79217c9f
周健威 authored Sep 21, 2019

79217c9f

20 Sep, 2019 6 commits
- Merge branch 'master-modify-cutAmount' into dev · 84a5f385
  周健威 authored Sep 20, 2019
  
  84a5f385
- 修改代码 · 4d220554
  周健威 authored Sep 20, 2019
  
  4d220554
- Merge remote-tracking branch 'origin/dev' into dev · 9cbea6cd
  周健威 authored Sep 20, 2019
  
  9cbea6cd
- Merge branch 'master-modify-cutAmount' into dev · f0ac376a
  周健威 authored Sep 20, 2019
  
  f0ac376a
- Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · e1ac4396
  周健威 authored Sep 20, 2019
  
  e1ac4396
- 修改bug · d10f3d49
  周健威 authored Sep 20, 2019
  
  d10f3d49