• jiaorz's avatar
    Merge remote-tracking branch 'origin/base-modify' into base-modify · 5e59e940
    jiaorz authored
    # Conflicts:
    #	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/DailyVehicleOrderStatisticsBiz.java
    #	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/jobhandler/RentDepositJobHandler.java
    5e59e940
Name
Last commit
Last update
..
builder Loading commit data...
mapper Loading commit data...
application.yml Loading commit data...
bootstrap.yml Loading commit data...
logback.xml Loading commit data...