From ecf9f0669734d4397aa1277f9a22f515aa410062 Mon Sep 17 00:00:00 2001
From: yujian <yujian@123.com>
Date: 星期四, 20 六月 2019 17:04:11 +0800
Subject: [PATCH] 冲突文件
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 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 81902ce..7728d3b 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,13 +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