From 4a05f1c9c508ab7f10c5eae22a5c716f5454ca02 Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期二, 12 三月 2019 16:29:55 +0800
Subject: [PATCH] 冲突提交
---
fanli/src/main/java/com/yeshi/fanli/job/UpdateCommonOrderJob.java | 8 +-------
1 files changed, 1 insertions(+), 7 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/job/UpdateCommonOrderJob.java b/fanli/src/main/java/com/yeshi/fanli/job/UpdateCommonOrderJob.java
index a9c70ec..ad6d5b0 100644
--- a/fanli/src/main/java/com/yeshi/fanli/job/UpdateCommonOrderJob.java
+++ b/fanli/src/main/java/com/yeshi/fanli/job/UpdateCommonOrderJob.java
@@ -9,14 +9,9 @@
import javax.annotation.Resource;
import org.springframework.scheduling.annotation.Scheduled;
-import org.springframework.stereotype.Component;
import com.yeshi.fanli.entity.bus.user.Order;
-import com.yeshi.fanli.entity.taobao.PidUser;
import com.yeshi.fanli.entity.taobao.TaoBaoOrder;
-import com.yeshi.fanli.entity.taobao.TaoBaoUnionConfig;
-import com.yeshi.fanli.entity.taobao.TaoBaoWeiQuanOrder;
-import com.yeshi.fanli.exception.TaoBaoOrderException;
import com.yeshi.fanli.log.LogHelper;
import com.yeshi.fanli.service.inter.common.DataMonitorService;
import com.yeshi.fanli.service.inter.hongbao.HongBaoService;
@@ -34,12 +29,11 @@
import com.yeshi.fanli.util.RedisManager;
import com.yeshi.fanli.util.StringUtil;
import com.yeshi.fanli.util.TimeUtil;
-import com.yeshi.fanli.util.taobao.TaoBao110Util;
import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
import com.yeshi.fanli.util.taobao.TaoKeOrderApiUtil;
//浠庢窐瀹濈埇鍘昏鍗曟洿鏂�
-@Component
+//@Component
public class UpdateCommonOrderJob {
public UpdateCommonOrderJob() {
--
Gitblit v1.8.0