From 5c4ecf9e8b47efbbf5d21c9e109be0a60cb7e26d Mon Sep 17 00:00:00 2001
From: yujian <yujian>
Date: 星期一, 08 四月 2019 15:15:09 +0800
Subject: [PATCH] 冲突解决

---
 fanli/src/test/java/org/fanli/TaoKeTest.java |   12 +++++++++++-
 1 files changed, 11 insertions(+), 1 deletions(-)

diff --git a/fanli/src/test/java/org/fanli/TaoKeTest.java b/fanli/src/test/java/org/fanli/TaoKeTest.java
index 019c895..bd5e2f0 100644
--- a/fanli/src/test/java/org/fanli/TaoKeTest.java
+++ b/fanli/src/test/java/org/fanli/TaoKeTest.java
@@ -23,7 +23,7 @@
 import com.yeshi.fanli.util.taobao.TaoBaoOrderUtil;
 import com.yeshi.fanli.util.taobao.TaoKeApiUtil;
 
-@Ignore
+//@Ignore
 public class TaoKeTest {
 
 	public static int count = 0;
@@ -101,4 +101,14 @@
 			e.printStackTrace();
 		}
 	}
+
+	@Test
+	public void test5() {
+		try {
+		TaoBaoGoodsBrief goods=	TaoKeApiUtil.getSimpleGoodsInfo(566534626407L);
+		System.out.println(goods);
+		} catch (TaobaoGoodsDownException e) {
+			e.printStackTrace();
+		}
+	}
 }

--
Gitblit v1.8.0