Commits · 9b927dd2244b7a14f4b4b8b19b061a9c5e16d1cc · youjj / cloud-platform

23 Sep, 2019 28 commits

Merge branch 'master-modify-cutAmount' into dev · 9b927dd2
周健威 authored Sep 23, 2019

9b927dd2
修改优惠券返回bug · 7a993b17
周健威 authored Sep 23, 2019

7a993b17
修改代码 · f14c1510
周健威 authored Sep 23, 2019

f14c1510
Merge branch 'master-modify-cutAmount' into dev · 8c4f26e1
周健威 authored Sep 23, 2019

8c4f26e1
修改代码 · 759ab4ae
周健威 authored Sep 23, 2019

759ab4ae

Merge branch 'master-bug-0921' into dev · 34825ad6

jiaorz authored Sep 23, 2019

# Conflicts:
#	xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml

34825ad6

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 · e966b12c

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

e966b12c

Merge branch 'master-bug-0921' into dev · 8bac8f93
jiaorz authored Sep 23, 2019

8bac8f93

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 remote-tracking branch 'origin/dev' into dev · 18379919
jiaorz authored Sep 23, 2019

18379919
Merge branch 'master-bug-0921' into dev · 3d0e2eac
jiaorz authored Sep 23, 2019

3d0e2eac

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 remote-tracking branch 'origin/dev' into dev · a075f821
周健威 authored Sep 23, 2019

a075f821
修改代码 · 09cf806b
周健威 authored Sep 23, 2019

09cf806b
Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 549d411d
hezhen authored Sep 23, 2019

549d411d
Merge branch 'hz_master' into dev · 3c37a81d
hezhen authored Sep 23, 2019

3c37a81d
123 · 51fef0f1
hezhen authored Sep 23, 2019

51fef0f1
Merge branch 'master-bug-0921' into dev · 765e1fa9
jiaorz authored Sep 23, 2019

765e1fa9

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-bug-0921' into dev · 8d07da8e
jiaorz authored Sep 23, 2019

8d07da8e

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 remote-tracking branch 'origin/dev' into dev · 654dabc1
jiaorz authored Sep 23, 2019

654dabc1

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 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · 5f11ce63
hezhen authored Sep 23, 2019

5f11ce63
123 · 4f78f3b5
hezhen authored Sep 23, 2019

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

e451116e

21 Sep, 2019 12 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 · 4124cf12
  libin authored Sep 21, 2019
  
  4124cf12
- 小程序租车申请列表 · 95a3c6b4
  libin authored Sep 21, 2019
  
  95a3c6b4
- 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