Merge remote-tracking branch 'origin/master'

admin

2019-02-26 4fe5f879c1b2919099a6e193ab4db8d25725ca40

 fanli/src/main/java/com/yeshi/fanli/util/SpringContext.java

@@ -16,7 +16,6 @@
import org.yeshi.utils.tencentcloud.entity.COSInitParams;



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

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

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

import com.yeshi.fanli.entity.push.PushQueueRecord;

import com.yeshi.fanli.entity.taobao.TaoBaoOrder;