• 周健威's avatar
    Merge branch 'dev' into base-modify · 06d66466
    周健威 authored
    # Conflicts:
    #	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/OrderTourVerificationBiz.java
    #	xx-tour/xx-tour-api/src/main/java/com/xxfc/platform/tour/feign/TourFeign.java
    #	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
    #	xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/SysRegionController.java
    06d66466
Name
Last commit
Last update
..
xx-order-api Loading commit data...
xx-order-server Loading commit data...
pom.xml Loading commit data...