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

admin

2020-07-01 5a37edc8cb5e4fb62e374d55b504843d2f5a4a6c

 fanli/src/main/java/com/yeshi/fanli/job/order/vipshop/UpdateVipShopOrderJob.java

@@ -18,7 +18,7 @@
import com.yeshi.fanli.util.RedisKeyEnum;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.StringUtil;

import com.yeshi.fanli.util.cmq.order.VipShopOrderCMQManager;

import com.yeshi.fanli.util.mq.cmq.order.VipShopOrderCMQManager;

import com.yeshi.fanli.util.vipshop.VipShopApiUtil;



//从淘宝爬去订单更新