From 2eec6d7304771ba0b14cfed75ca0e39a3aebae10 Mon Sep 17 00:00:00 2001
From: richboo111 <yangsiqi1376@163.com>
Date: Fri, 30 Sep 2022 17:14:10 +0800
Subject: [PATCH] 1

---
 .../tiktok_shop/sdk-golang/core/doudian_op_spi_config.go      | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/platformapi/tiktok_shop/sdk-golang/core/doudian_op_spi_config.go b/platformapi/tiktok_shop/sdk-golang/core/doudian_op_spi_config.go
index 14818dcc..e4d61e37 100644
--- a/platformapi/tiktok_shop/sdk-golang/core/doudian_op_spi_config.go
+++ b/platformapi/tiktok_shop/sdk-golang/core/doudian_op_spi_config.go
@@ -36,10 +36,6 @@ func ConfigSpiWithUrlQuery(request DoudianOpSpiRequest, handler BizHandler, quer
 	appKey := queries.Get("app_key")
 	paramJson := queries.Get("param_json")
 	if len(paramJson) == 0 {
-<<<<<<< HEAD
-		//bs, _ := io.ReadAll(body)
-=======
->>>>>>> 4829577ec90a3adad3ba5b0b591b6537e86a3915
 		bs, _ := ioutil.ReadAll(body)
 		paramJson = string(bs)
 	}