- 16 Sep, 2019 32 commits
-
-
hanfeng 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
-
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
# 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
-
-
jiaorz authored
-
jiaorz authored
-
jiaorz authored
-
-
-
周健威 authored
-
周健威 authored
-
jiaorz authored
-
jiaorz authored
-
周健威 authored
# Conflicts: # xx-im/xx-im-server/src/main/java/com/xxfc/platform/im/biz/MsgBiz.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 # 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/resources/mapper/VehicleBookRecordMapper.xml # xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
-
周健威 authored
-
jiaorz authored
-
周健威 authored
# Conflicts: # 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 # 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/resources/mapper/VehicleBookRecordMapper.xml # xx-vehicle/xx-vehicle-server/src/main/resources/mapper/VehicleMapper.xml
-
jiaorz authored
-
jiaorz authored
-
周健威 authored
-
周健威 authored
-
libin authored
# Conflicts: # xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleBiz.java
-
libin authored
-
jiaorz authored
-
jiaorz 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 8 commits
-
-
周健威 authored
# Conflicts: # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
-
周健威 authored
-
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
-
jiaorz authored
# Conflicts: # xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderAccountBiz.java
-
jiaorz authored
-
-
hezhen authored
-
