Merge branch 'master' into div

admin

2019-07-19 81832f53a54e322910585717db9d37b74d855357

 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;