• jiaorz's avatar
    Merge branch 'master-modify-background-bug-hf' · 6bb62c4c
    jiaorz authored
    # Conflicts:
    #	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
    #	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/BaseOrder.java
    #	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/order/OrderVehicleCrosstownDto.java
    #	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/biz/BaseOrderBiz.java
    6bb62c4c
Name
Last commit
Last update
..
java/com/xxfc/platform/activity Loading commit data...
resources Loading commit data...