美团cookie取消

2020-05-31 10:31:54 +08:00
parent cc82fe04be
commit 8df8ae8d87
2 changed files with 0 additions and 29 deletions
--- a/platformapi/jdshopapi/store_test.go
+++ b/platformapi/jdshopapi/store_test.go
@@ -55,11 +55,7 @@ func TestGetCity(t *testing.T) {
 }

 func TestGetCounty(t *testing.T) {
-<<<<<<< HEAD
 	result, err := api.GetCounty(2815)
-=======
-	result, err := api.GetCounty(2823)
->>>>>>> 6b4ee9a49b7be7d021c71cd098aeef6c9e75e5c2
 	if err != nil {
 		t.Fatal(err)
 	}