Merge remote-tracking branch 'origin/div' into div

yujian

2020-03-17 2242a113524da059a402af214aec30126789ce1e

 fanli/src/main/java/com/yeshi/fanli/controller/CallBackController.java

@@ -21,7 +21,6 @@


import com.aliyun.openservices.ons.api.Message;

import com.aliyun.openservices.ons.api.Producer;

import com.google.gson.Gson;

import com.yeshi.fanli.dto.mq.order.OrderTopicTagEnum;

import com.yeshi.fanli.dto.mq.order.body.BanLiShopOrderMQMsg;

import com.yeshi.fanli.dto.push.PushContentDTO;