From a0a5b70e0d0df9357d09542f20dc6633a986f328 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 25 六月 2019 11:06:36 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'

---
 fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java |   13 +++++++------
 1 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
index a84f664..3880340 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java
@@ -767,12 +767,13 @@
 		tg.setSalesType(1);
 		// 娴嬭瘯浣跨敤
 		// tg.setSalesType(Math.random() > 0.5 ? tg.getSalesType() : 3);
-		if (Constant.IS_TEST) {
-			List<ClientTextStyleVO> labels = new ArrayList<>();
-			labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#F14242"));
-			labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#00FF00"));
-			tg.setLabels(labels);
-		}
+//		if(Constant.IS_TEST)
+//		{
+//		 List<ClientTextStyleVO> labels = new ArrayList<>();
+//		 labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#F14242"));
+//		 labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#00FF00"));
+//		 tg.setLabels(labels);
+//		}
 		return tg;
 	}
 

--
Gitblit v1.8.0