From 221b5c8d0de3f6b17a00d543503a79c13b28ba12 Mon Sep 17 00:00:00 2001
From: admin <weikou2014>
Date: 星期三, 13 十一月 2019 16:45:57 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/div' into div
---
fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java | 22 +++++++++++-----------
1 files changed, 11 insertions(+), 11 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
index 07fa012..424397e 100644
--- a/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
+++ b/fanli/src/main/java/com/yeshi/fanli/util/factory/goods/GoodsDetailVOFactory.java
@@ -441,17 +441,17 @@
goodsInfo = loadYuShouInfo(goodsInfo, goods, null, params.getFanLiRate(), params.getShareRate());
}
-// if (Constant.IS_TEST) {
-// // 娣诲姞鏍囩
-// List<ClientTextStyleVO> labels = goodsInfo.getLabels();
-// if (labels == null)
-// labels = new ArrayList<>();
-//
-// labels.add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
-// labels.add(new ClientTextStyleVO("鐖嗘", "#FF2B4E"));
-// labels.add(new ClientTextStyleVO("瓒呯骇鍒掔畻", "#FF2B4E"));
-// goodsInfo.setLabels(labels);
-// }
+ if (Constant.IS_TEST) {
+ // 娣诲姞鏍囩
+ List<ClientTextStyleVO> labels = goodsInfo.getLabels();
+ if (labels == null)
+ labels = new ArrayList<>();
+
+ labels.add(new ClientTextStyleVO("棰勫敭", "#FF2B4E"));
+ labels.add(new ClientTextStyleVO("鐖嗘", "#FF2B4E"));
+ labels.add(new ClientTextStyleVO("瓒呯骇鍒掔畻", "#FF2B4E"));
+ goodsInfo.setLabels(labels);
+ }
return goodsInfo;
}
--
Gitblit v1.8.0