• libin's avatar
    Merge branch 'staff-statistics' into dev · 5be635ae
    libin authored
    # Conflicts:
    #	ace-common/src/main/java/com/github/wxiaoqi/security/common/enumconstant/LevelEnum.java
    #	ace-modules/ace-admin-api/src/main/java/com/github/wxiaoqi/security/admin/feign/UserFeign.java
    #	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserDetailMapper.java
    #	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/PublicController.java
    #	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml
    #	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/pojo/dto/OrderDTO.java
    #	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/OrderAccountBiz.java
    #	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/BaseOrderMapper.java
    #	xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/mapper/OrderAccountMapper.java
    #	xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml
    #	xx-order/xx-order-server/src/main/resources/mapper/OrderAccountMapper.xml
    #	xx-order/xx-order-server/src/test/java/ServiceTest.java
    #	xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/feign/VehicleFeign.java
    5be635ae
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...