Merge branch 'master' into div

yujian

2019-07-11 e4a56b57d3e10b9b46eaefe5194bbf98fcc45698

 fanli/src/main/java/com/yeshi/fanli/service/impl/hongbao/AccountDetailsHongBaoMapServiceImpl.java

@@ -9,7 +9,7 @@
import org.springframework.transaction.annotation.Transactional;



import com.yeshi.fanli.dao.mybatis.money.AccountDetailHongBaoMapMapper;

import com.yeshi.fanli.entity.bus.user.HongBao;

import com.yeshi.fanli.dto.HongBao;

import com.yeshi.fanli.entity.money.AccountDetailHongBaoMap;

import com.yeshi.fanli.entity.money.UserMoneyDetail;

import com.yeshi.fanli.service.inter.hongbao.AccountDetailsHongBaoMapService;