Merge remote-tracking branch 'origin/div' into 2.1.2

admin

2020-05-20 98b1a0affd69bbe63223c21fdd2c404e8bedfccb

 fanli/src/main/java/com/yeshi/fanli/service/impl/redpack/RedPackGiveRecordServiceImpl.java

@@ -26,6 +26,7 @@
import com.yeshi.fanli.entity.redpack.RedPackDetail;

import com.yeshi.fanli.entity.redpack.RedPackDetail.RedPackDetailTypeEnum;

import com.yeshi.fanli.entity.redpack.RedPackGiveRecord;

import com.yeshi.fanli.entity.system.ConfigKeyEnum;

import com.yeshi.fanli.exception.redpack.RedPackGiveRecordException;

import com.yeshi.fanli.log.LogHelper;

import com.yeshi.fanli.service.inter.money.msg.UserMoneyMsgNotificationService;