• hanfeng's avatar
    Merge branch 'master_activity-hf' into base-modify · a3739ee8
    hanfeng authored
    # Conflicts:
    #	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/BaseUserMemberExportBiz.java
    #	xx-order/xx-order-api/src/main/java/com/xxfc/platform/order/entity/DailyVehicleOrderStatistics.java
    a3739ee8
Name
Last commit
Last update
..
AppUserCollectMapper.xml Loading commit data...
AppUserDetailMapper.xml Loading commit data...
AppUserLoginMapper.xml Loading commit data...
AppUserMapper.xml Loading commit data...
AppUserPositionMapper.xml Loading commit data...
AppUserRelationMapper.xml Loading commit data...
AppUserSellingWaterMapper.xml Loading commit data...
BaseUserMemberExportMapper.xml Loading commit data...
BaseUserMemberLevelMapper.xml Loading commit data...
BaseUserMemberMapper.xml Loading commit data...
ElementMapper.xml Loading commit data...
GateLogMapper.xml Loading commit data...
GroupMapper.xml Loading commit data...
GroupTypeMapper.xml Loading commit data...
MenuMapper.xml Loading commit data...
MyWalletCathMapper.xml Loading commit data...
MyWalletDetailMapper.xml Loading commit data...
MyWaterMapper.xml Loading commit data...
ResourceAuthorityMapper.xml Loading commit data...
UserMapper.xml Loading commit data...