Commits · 6b7c698ba1fccd8f7a8915739fd11263c9d3c5aa · youjj / cloud-platform

18 Sep, 2019 3 commits
- Merge branch 'master-ucc-feature' into base-modify · 6b7c698b
  libin authored Sep 18, 2019
```
# Conflicts:
#	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
#	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/mapper/BranchCompanyMapper.java
```
  6b7c698b
- Merge remote-tracking branch 'origin/base-modify' into base-modify · 127049c8
  libin authored Sep 18, 2019
  
  127049c8
- 官网二期优化综合搜索 · eb902b27
  libin authored Sep 18, 2019
  
  eb902b27
17 Sep, 2019 7 commits
- Merge remote-tracking branch 'origin/master' into master-ucc-feature · a1c8b028
  libin authored Sep 17, 2019
  
  a1c8b028
- 官网的车型类型与分公司 · 8f74b335
  libin authored Sep 17, 2019
  
  8f74b335
- Merge branch 'master-modify-cutAmount' into base-modify · d7225ffb
  jiaorz authored Sep 17, 2019
  
  d7225ffb
- Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · 0c954fd5
  jiaorz authored Sep 17, 2019
  
  0c954fd5
- Merge branch 'master-modify-cutAmount' into dev · a4b93a66
  jiaorz authored Sep 17, 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
```
  a4b93a66
- Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · a8248fb0
  周健威 authored Sep 17, 2019
  
  a8248fb0
- 修改代码 · 05afd2a5
  周健威 authored Sep 17, 2019
  
  05afd2a5
16 Sep, 2019 30 commits

Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · c43fa74d
hanfeng authored Sep 16, 2019

c43fa74d
修改订单统计 · 8041c29b
hanfeng authored Sep 16, 2019

8041c29b
修改bug · 70387488
周健威 authored Sep 16, 2019

70387488

Merge remote-tracking branch 'origin/base-modify' into base-modify · 91bf3bac

libin authored Sep 16, 2019

# Conflicts:
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
#	xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml

91bf3bac

修改代码 · 7931bba9
周健威 authored Sep 16, 2019

7931bba9
merg · 9304e0d8
libin authored Sep 16, 2019

9304e0d8
Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · be9fce4c
hanfeng authored Sep 16, 2019
```
# Conflicts:
#	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java
```
be9fce4c

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

jiaorz authored Sep 16, 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

c0660da2

Merge remote-tracking branch 'origin/dev' into dev · 048026ec
libin authored Sep 16, 2019

048026ec
营地排序 · 50074a34
libin authored Sep 16, 2019

50074a34
营地排序 · ba09ed09
libin authored Sep 16, 2019

ba09ed09
Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · c9c0709b
jiaorz authored Sep 16, 2019

c9c0709b

Merge branch 'master-modify-cutAmount' into dev · 1f47fe38

jiaorz authored Sep 16, 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

1f47fe38

Merge remote-tracking branch 'origin/dev' into dev · fa7245cd
hanfeng authored Sep 16, 2019

fa7245cd
修改车辆订单后台相关接口 · a9aec43b
hanfeng authored Sep 16, 2019

a9aec43b
Merge remote-tracking branch 'origin/dev' into dev · 9a012ed9
libin authored Sep 16, 2019

9a012ed9
旅游订单核销 · 359c87f3
libin authored Sep 16, 2019

359c87f3
修改车辆订单后台管相关接口 · 66a4b194
hanfeng authored Sep 16, 2019

66a4b194
Merge branch 'master-modify-cutAmount' into dev · c41c9981
周健威 authored Sep 16, 2019

c41c9981
修改代码 · 0dd11ff7
周健威 authored Sep 16, 2019

0dd11ff7

Merge branch 'master-modify-cutAmount' into dev · 359280b9

jiaorz authored Sep 16, 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

359280b9

Merge branch 'master-modify-cutAmount' into dev · 4fab1414

jiaorz authored Sep 16, 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

4fab1414

Merge branch 'master-modify-cutAmount' into dev · 678ba47d

jiaorz authored Sep 16, 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

678ba47d

Revert "Revert "Merge branch 'master-modify-cutAmount' into 'dev'"" · 012e9e0a
周健威 authored Sep 16, 2019
```
This reverts commit d9646812
```
012e9e0a

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

jiaorz authored Sep 16, 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

b8bc0924

Revert "Merge branch 'master-modify-cutAmount' into 'dev'" · d9646812
周健威 authored Sep 16, 2019
```
This reverts merge request !24
```
d9646812

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

jiaorz authored Sep 16, 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

d5adc033

Merge branch 'dev' of http://113.105.137.151:22280/youjj/cloud-platform into dev · cb4a3553
hezhen authored Sep 16, 2019

cb4a3553
code重复同步数据 · 0d7c3c47
hezhen authored Sep 16, 2019

0d7c3c47

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

jiaorz authored Sep 16, 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

c73170bd