From 0fbe4163e855c1537d6f0040b12fa1501a499de0 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期二, 11 六月 2019 09:13:05 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
fanli/src/main/java/com/yeshi/fanli/util/taobao/TaoBaoUtil.java | 8 ++++----
1 files changed, 4 insertions(+), 4 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 65cc31a..53156cd 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
@@ -766,10 +766,10 @@
tg.setSalesType(1);
// 娴嬭瘯浣跨敤
// tg.setSalesType(Math.random() > 0.5 ? tg.getSalesType() : 3);
- // List<ClientTextStyleVO> labels = new ArrayList<>();
- // labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#F14242"));
- // labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#00FF00"));
- // tg.setLabels(labels);
+ List<ClientTextStyleVO> labels = new ArrayList<>();
+ labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#F14242"));
+ labels.add(new ClientTextStyleVO("鏍囩鍐呭", "#00FF00"));
+ tg.setLabels(labels);
return tg;
}
--
Gitblit v1.8.0