Commits · 80c728d11a498a1719c2f3f6f12c07a2af37b2ef · youjj / cloud-platform

18 Sep, 2019 8 commits

Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · 80c728d1
jiaorz authored Sep 18, 2019

80c728d1

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

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

d0c0b34c

Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · aa6f249d
周健威 authored Sep 18, 2019

aa6f249d
修复订单相关bug · 3cc2de03
周健威 authored Sep 18, 2019

3cc2de03
Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · df999680
jiaorz authored Sep 18, 2019

df999680

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

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

8a79ef09

修复订单相关bug · 26cacf84
周健威 authored Sep 18, 2019

26cacf84
修复订单相关bug · 7765cc1e
周健威 authored Sep 18, 2019

7765cc1e

17 Sep, 2019 14 commits
- 修复bug · 7462637a
  周健威 authored Sep 17, 2019
  
  7462637a
- 修复短信发送bug · 8a8f3ae5
  周健威 authored Sep 17, 2019
  
  8a8f3ae5
- Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · 86a391c0
  周健威 authored Sep 17, 2019
  
  86a391c0
- 修复短信发送bug · aed011ec
  周健威 authored Sep 17, 2019
  
  aed011ec
- Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · 0149f3a5
  jiaorz authored Sep 17, 2019
  
  0149f3a5
- Merge branch 'master-modify-cutAmount' into dev · afc3daaf
  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
```
  afc3daaf
- 修复短信发送bug · 4d325b34
  周健威 authored Sep 17, 2019
  
  4d325b34
- 修改短信发送bug · 762293e3
  周健威 authored Sep 17, 2019
  
  762293e3
- Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · 01cf0b45
  周健威 authored Sep 17, 2019
  
  01cf0b45
- 修改bug · a6f4375a
  周健威 authored Sep 17, 2019
  
  a6f4375a
- 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 18 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
- 修改代码 · 7931bba9
  周健威 authored Sep 16, 2019
  
  7931bba9
- 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/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
- 修改代码 · 0dd11ff7
  周健威 authored Sep 16, 2019
  
  0dd11ff7
- Revert "Revert "Merge branch 'master-modify-cutAmount' into 'dev'"" · 012e9e0a
  周健威 authored Sep 16, 2019
```
This reverts commit d9646812
```
  012e9e0a
- Revert "Merge branch 'master-modify-cutAmount' into 'dev'" · d9646812
  周健威 authored Sep 16, 2019
```
This reverts merge request !24
```
  d9646812
- Merge branch 'dev' into 'master-modify-cutAmount' · 4c0a1b52
  周健威 authored Sep 16, 2019
```
# Conflicts:
#   xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderVehicleCrosstownBiz.java
#   xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
```
  4c0a1b52
- Revert "Revert "Merge branch 'master-modify-cutAmount' into dev"" · b3928fe8
  周健威 authored Sep 16, 2019
```
This reverts commit 7c23a0fe
```
  b3928fe8
- 修改管家核销订单列表 · 3c5379aa
  jiaorz authored Sep 16, 2019
  
  3c5379aa
- Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · 012b042d
  jiaorz authored Sep 16, 2019
  
  012b042d
- 修改管家核销订单列表 · 9d6c8d6c
  jiaorz authored Sep 16, 2019
  
  9d6c8d6c
- Revert "Merge branch 'master-modify-cutAmount' into dev" · 7c23a0fe
  周健威 authored Sep 16, 2019
```
This reverts commit e0519b8e
```
  7c23a0fe
- Revert "修改代码" · 47a6195f
  周健威 authored Sep 16, 2019
```
This reverts commit d3aab21b
```
  47a6195f