• 周健威's avatar
    Merge branch 'master' into dev · 55f4a4c2
    周健威 authored
    # Conflicts:
    #	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/VehicleActiveService.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/biz/VehicleBookHourInfoBiz.java
    55f4a4c2
Name
Last commit
Last update
..
src/main/java/com/xxfc/platform/vehicle Loading commit data...
pom.xml Loading commit data...