- 17 Sep, 2019 9 commits
 - 
- 
jiaorz authored
# 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
 - 
jiaorz authored
 - 
jiaorz authored
 - 
jiaorz authored
 - 
jiaorz authored
# 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
 - 
周健威 authored
 - 
周健威 authored
 - 
周健威 authored
 - 
hanfeng authored
 
 - 
 - 16 Sep, 2019 31 commits
 - 
- 
hanfeng authored
 - 
hanfeng authored
 - 
周健威 authored
 - 
周健威 authored
 - 
周健威 authored
 - 
周健威 authored
 - 
周健威 authored
 - 
hanfeng authored
# Conflicts: # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java
 - 
jiaorz authored
# 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
 - 
libin authored
 - 
libin authored
 - 
jiaorz authored
 - 
jiaorz authored
# 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
 - 
hanfeng authored
 - 
hanfeng authored
 - 
libin authored
 - 
libin authored
 - 
hanfeng authored
 - 
周健威 authored
 - 
周健威 authored
 - 
 - 
hezhen authored
 - 
周健威 authored
# 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
 - 
libin authored
 - 
libin authored
 - 
jiaorz authored
 - 
jiaorz authored
 
 -