1

2023-08-31 15:06:41 +08:00
parent 4054cb523d
commit 0395ee4617
5 changed files with 49 additions and 58 deletions
--- a/platformapi/mtwmapi/mtwmapi_test.go
+++ b/platformapi/mtwmapi/mtwmapi_test.go
@@ -26,11 +26,8 @@ func init() {
 	//api = New("4123", "df2c88338b85f830cebce2a9eab56628", "", "")

 	//商超
-<<<<<<< HEAD
 	//api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_ovSLnyKTsMNx0RxMzJ1C7w") //token_n4TwqCntWWuvQwAawzxC0w
-=======
-	//api = New("5873", "41c479790a76f86326f89e8048964739", "", "token_v-zI40EPjPfXLmaKdgRPqA") //token_n4TwqCntWWuvQwAawzxC0w
->>>>>>> 1eebd3a457d772f335a41fd04f88e08ffc8e1bc3
+
 	cookieStr := `
 		acctId=57396785; token=0bWbK5VbK50E2BmIhIH2zHB-am_y7mB37yXHm6RLZWx4*; wmPoiId=-1;
 	`