# Conflicts:
#	lottery-domain/src/main/java/cn/happy/lottery/domain/activity/repository/IActivityRepository.java
#	lottery-infrastructure/src/main/java/cn/happy/lottery/infrastructure/dao/IActivityDao.java
#	lottery-infrastructure/src/main/java/cn/happy/lottery/infrastructure/repository/ActivityRepository.java
#	lottery-interfaces/src/main/resources/mybatis/mapper/Activity_Mapper.xml