Merge branch 'div' into div-1

yujian

2020-03-31 15269f168b9d2bf559c93ced761f192393e2d928

 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;