• libin's avatar
    Merge branch 'holiday-price' into dev · cb63c944
    libin authored
    # Conflicts:
    #	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
    #	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
    cb63c944
Name
Last commit
Last update
..
xx-order-api Loading commit data...
xx-order-server Loading commit data...
pom.xml Loading commit data...