-
# Conflicts: # service/src/main/java/com/yoho/activity/service/impl/LotteryServiceImpl.java
-
# Conflicts: # controller/src/main/java/com/yoho/activity/controller/LotteryController.java # dal/src/main/resources/META-INF/mybatis/LotteryRecordMapper.xml # service/src/main/java/com/yoho/activity/service/ILotteryService.java # service/src/main/java/com/yoho/activity/service/impl/LotteryServiceImpl.java
-
# Conflicts: # dal/src/main/java/com/yoho/lottery/dal/LotteryRecordMapper.java # dal/src/main/resources/META-INF/mybatis/LotteryRecordMapper.xml # service/src/main/java/com/yoho/activity/service/impl/LotteryServiceImpl.java
-
修改短信提示语
