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

admin

2019-10-22 04f5c3bd20524c97dce07cc03bb24e190303083a

 fanli/src/main/java/com/yeshi/fanli/controller/admin/UploadController.java

@@ -24,7 +24,7 @@
import com.yeshi.fanli.service.AdminUserService;

import com.yeshi.fanli.service.inter.order.OrderProcessService;

import com.yeshi.fanli.service.inter.order.OrderService;

import com.yeshi.fanli.service.inter.taobao.TaoBaoOrderService;

import com.yeshi.fanli.service.inter.order.tb.TaoBaoOrderService;

import com.yeshi.fanli.util.CMQManager;

import com.yeshi.fanli.util.Constant;

import com.yeshi.fanli.util.RedisManager;