1

2022-09-30 17:14:10 +08:00
parent b9f898999b
commit 2eec6d7304
1 changed files with 0 additions and 4 deletions
--- 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)
 	}