Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div

yujian

2019-12-07 1fd8f11537bb74c1f7e611e35a766cbbd34eff05

 fanli/src/main/java/com/yeshi/fanli/job/order/pdd/UpdatePDDOrderJob.java

@@ -12,7 +12,7 @@
import com.yeshi.fanli.dto.pdd.PDDOrderResult;

import com.yeshi.fanli.entity.pdd.PDDOrder;

import com.yeshi.fanli.exception.pdd.PDDOrderException;

import com.yeshi.fanli.service.inter.pdd.PDDOrderService;

import com.yeshi.fanli.service.inter.order.pdd.PDDOrderService;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;

import com.yeshi.fanli.util.cmq.PDDOrderCMQManager;