• hanfeng's avatar
    Merge branch 'master-modify-background-bug-hf' · a3e398f1
    hanfeng authored
    # Conflicts:
    #	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/dto/AppUserManageDTO.java
    #	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
    #	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
    #	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
    a3e398f1
Name
Last commit
Last update
..
builder Loading commit data...
file Loading commit data...
mapper Loading commit data...
application.yml Loading commit data...
bootstrap.yml Loading commit data...
logback.xml Loading commit data...