- 23 Sep, 2019 9 commits
-
-
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
-
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
-
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
-
-
hezhen authored
-
jiaorz authored
-
- 21 Sep, 2019 31 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
-
周健威 authored# Conflicts: # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
-
libin authored
-
libin authored
-
周健威 authored
-
周健威 authored
-
周健威 authored
-
周健威 authored
-
libin authored
-
libin authored
-
周健威 authored
-
周健威 authored
-
libin authored
-
libin authored
-
周健威 authored
-
周健威 authored
-
周健威 authored
-
周健威 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
-
libin authored
-
libin authored
-
周健威 authored
-
周健威 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
-
libin authored
-
libin authored
-
libin authored
-
jiaorz authored
# Conflicts: # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.java
-
jiaorz authored
-
