Merge remote-tracking branch 'origin/master'

admin

2019-05-22 9b4bf99c1a30f3a7c2bdd6faba7589ff4f7e48e5

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

@@ -13,9 +13,9 @@
import com.google.gson.GsonBuilder;

import com.google.gson.reflect.TypeToken;

import com.qcloud.cmq.Message;

import com.yeshi.fanli.dto.HongBao;

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

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

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

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

import com.yeshi.fanli.entity.common.AdminUser;

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