From 2f2860b50f24e5e3598d223db03d43df61d95c97 Mon Sep 17 00:00:00 2001
From: yj <Administrator@192>
Date: 星期五, 13 三月 2020 16:31:30 +0800
Subject: [PATCH] Merge branch 'div' of ssh://193.112.35.168:29418/fanli-server into div
---
fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java | 3 ++-
1 files changed, 2 insertions(+), 1 deletions(-)
diff --git a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java
index 6ce78e5..b0dffb7 100644
--- a/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java
+++ b/fanli/src/main/java/com/yeshi/fanli/controller/client/v1/BrandController.java
@@ -18,6 +18,7 @@
import com.yeshi.fanli.entity.accept.AcceptData;
import com.yeshi.fanli.entity.brand.BrandClass;
import com.yeshi.fanli.entity.brand.TaoBaoShopHistory;
+import com.yeshi.fanli.entity.system.ConfigKeyEnum;
import com.yeshi.fanli.entity.taobao.TaoBaoGoodsBrief;
import com.yeshi.fanli.entity.taobao.TaoBaoShop;
import com.yeshi.fanli.entity.taobao.dataoke.DaTaoKeDetailV2;
@@ -88,7 +89,7 @@
}
JSONObject data = new JSONObject();
- data.put("bgPicture", configService.get("brand_background_picture"));
+ data.put("bgPicture", configService.get(ConfigKeyEnum.brandBackgroundPicture.getKey()));
data.put("count", list.size());
data.put("list", JsonUtil.getApiCommonGson().toJson(list));
--
Gitblit v1.8.0