1

2023-02-14 15:56:02 +08:00
parent 4e5a9ce0c0
commit f1ec0d27a1
1 changed files with 0 additions and 4 deletions
--- a/platformapi/ebaiapi/shop_test.go
+++ b/platformapi/ebaiapi/shop_test.go
@@ -53,11 +53,7 @@ func TestShopCreate(t *testing.T) {
 }

 func TestShopGet(t *testing.T) {
-<<<<<<< HEAD
-	result, err := api.ShopGet2("", 1101809925) //2233065879 ,22267134648
-=======
 	result, err := api.ShopGet2("", 2235877567) //2233065879 ,22267134648
->>>>>>> c32151cdb461bbd605e7336062d7f9d3d22ef127
 	if err != nil {
 		t.Fatal(err)
 	} else {