• jiaorz's avatar
    Merge branch 'master-activity-bk' into dev · dd7a9d63
    jiaorz authored
    # Conflicts:
    #	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserRelationBiz.java
    #	xx-activity/xx-activity-server/src/main/java/com/xxfc/platform/activity/biz/ActivityPopularizeBiz.java
    dd7a9d63
Name
Last commit
Last update
..
ActivityAttendanceRecordMapper.xml Loading commit data...
ActivityListMapper.xml Loading commit data...
ActivityLuckyDrawMapper.xml Loading commit data...
ActivityPopularizeItemMapper.xml Loading commit data...
ActivityPopularizeLogMapper.xml Loading commit data...
ActivityPopularizeMapper.xml Loading commit data...
ActivityPopularizeRelationMapper.xml Loading commit data...
ActivityPopularizeUserMapper.xml Loading commit data...
ActivityPrizeMapper.xml Loading commit data...
ActivityRuleMapper.xml Loading commit data...
ActivityUserJoinMapper.xml Loading commit data...
ActivityWinningRecordMapper.xml Loading commit data...
CouponMapper.xml Loading commit data...
IntegralRuleMapper.xml Loading commit data...
IntegralSignRecordMapper.xml Loading commit data...
IntegralUserRecordMapper.xml Loading commit data...
IntegralUserStatusMapper.xml Loading commit data...
IntegralUserTotalMapper.xml Loading commit data...
TicketCollectionRecordMapper.xml Loading commit data...
UserCouponMapper.xml Loading commit data...