Merge remote-tracking branch 'origin/master'

hexiaohui

2019-04-03 d4b3ee96ac6093683fce254541b113fb6a762060

 fanli/src/main/java/com/yeshi/fanli/util/factory/UserMoneyDetailFactory.java

@@ -4,9 +4,9 @@
import java.util.Calendar;

import java.util.Date;



import com.yeshi.fanli.dto.HongBao;

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

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

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

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

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

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