Commits · 79217c9f7f49fdeb4d380a69b50c72c0c15844bf · youjj / cloud-platform

21 Sep, 2019 1 commit
- 修改代码 · 79217c9f
  周健威 authored Sep 21, 2019
  
  79217c9f
20 Sep, 2019 29 commits

修改代码 · 4d220554
周健威 authored Sep 20, 2019

4d220554
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

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

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

f0c2c13c

Merge branch 'master-modify-cutAmount' into dev · 2068ad02

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

2068ad02

Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · 5ac971a4
jiaorz authored Sep 20, 2019

5ac971a4

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

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

8d91a099

修改bug · 52babe51
周健威 authored Sep 20, 2019

52babe51
修改bug · 9e694f0e
周健威 authored Sep 20, 2019

9e694f0e
修改bug · cf08b37f
周健威 authored Sep 20, 2019

cf08b37f
修改bug · 751dcfe9
周健威 authored Sep 20, 2019

751dcfe9
修改优惠券bug · 0c395dc3
周健威 authored Sep 20, 2019

0c395dc3
修改优惠券bug · b4301c95
周健威 authored Sep 20, 2019

b4301c95
添加精度 · 73f5075e
周健威 authored Sep 20, 2019

73f5075e
修改部分bug · 48609c4b
周健威 authored Sep 20, 2019

48609c4b
Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · 7d64f198
周健威 authored Sep 20, 2019

7d64f198
修改部分bug · 3e2cac4c
周健威 authored Sep 20, 2019

3e2cac4c
Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · c17b2f3c
jiaorz authored Sep 20, 2019

c17b2f3c

Merge branch 'master-modify-cutAmount' into dev · 07a1c107

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

07a1c107

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

61ba4c3c
修改部分bug · c8351eb5
周健威 authored Sep 20, 2019

c8351eb5

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

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

ef449193

修改部分bug · af55293f
周健威 authored Sep 20, 2019

af55293f
Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · 7a9269d1
周健威 authored Sep 20, 2019

7a9269d1
修改部分bug · 1a4d47f7
周健威 authored Sep 20, 2019

1a4d47f7
Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · 945850ee
jiaorz authored Sep 20, 2019

945850ee

Merge branch 'master-modify-cutAmount' into dev · 091f3b0d

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

091f3b0d

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

ae656f5b
修改免费天数bug · 89d12970
周健威 authored Sep 20, 2019

89d12970

19 Sep, 2019 10 commits

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

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

4ee5c2a8

Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · 07c6ab4d
jiaorz authored Sep 19, 2019

07c6ab4d

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

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

b6ee679e

修改免费天数bug · 26422e89
周健威 authored Sep 19, 2019

26422e89
修改bug · b12493b2
周健威 authored Sep 19, 2019

b12493b2
修改代码 · b98f517d
周健威 authored Sep 19, 2019

b98f517d
修改代码 · 6443de8b
周健威 authored Sep 19, 2019

6443de8b
Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · fb0c492f
周健威 authored Sep 19, 2019

fb0c492f
修改代码 · a231cd6e
周健威 authored Sep 19, 2019

a231cd6e
Merge remote-tracking branch 'origin/master-modify-cutAmount' into master-modify-cutAmount · 391a6c51
jiaorz authored Sep 19, 2019

391a6c51