- 21 Sep, 2019 2 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
# 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
-
- 19 Sep, 2019 1 commit
-
-
hanfeng authored
# Conflicts: # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java
-
- 16 Sep, 2019 5 commits
-
-
libin authored
-
hanfeng authored
-
libin authored
-
libin authored
-
jiaorz authored
# Conflicts: # xx-campsite/xx-campsite-server/src/main/resources/mapper/CampsiteShopMapper.xml # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleController.java # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java
-
- 12 Sep, 2019 7 commits
-
-
jiaorz authored
-
jiaorz authored
# Conflicts: # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBookRecordBiz.java # xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookInfoMapper.xml
-
libin authored
-
hanfeng authored
-
libin authored
-
libin authored
-
jiaorz authored
-
- 11 Sep, 2019 21 commits
-
-
-
hanfeng authored
-
-
hanfeng authored
-
jiaorz authored
-
周健威 authored
-
周健威 authored
-
hanfeng authored
-
周健威 authored
-
hezhen authored
-
hanfeng authored
-
-
周健威 authored
# Conflicts: # xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleBookRecordMapper.xml
-
hezhen authored
-
-
hezhen authored
-
hezhen authored
-
hanfeng authored
-
hanfeng authored
-
-
hezhen authored
-
- 10 Sep, 2019 4 commits
