解决代码冲突

src/test/java/com/mjitech/qa/test/GetMachineData.java

@@ -21,11 +21,7 @@ public class GetMachineData {
 	@Test
 	@Test
 	public void getMachineData() {
 	public void getMachineData() {
 		String url = "http://test.mjitech.com/web/pad_warehouse/getMachineData.action" ;
 		String url = "http://test.mjitech.com/web/pad_warehouse/getMachineData.action" ;
-<<<<<<< HEAD
 		String body = "{\"storeId\":\"50\"}";
 		String body = "{\"storeId\":\"50\"}";
-=======
-		String body = "{\"storeId\":\"17\"}";
->>>>>>> 4fff4323617d768dd0e82788992eeda74e1d0966
 		try {
 		try {
 			JSONObject result = service.httpPostFlat(url, body);
 			JSONObject result = service.httpPostFlat(url, body);
 			String code = result.getJSONObject("meta").getString("code");
 			String code = result.getJSONObject("meta").getString("code");

src/test/java/com/mjitech/qa/test/GetPagedMainpageData.java

@@ -16,11 +16,7 @@ public class GetPagedMainpageData {
 	BaseService service = new BaseService();
 	BaseService service = new BaseService();
 	@Test
 	@Test
 	public void test_login_with_openid() {
 	public void test_login_with_openid() {
-<<<<<<< HEAD
-		String url = "http://test.mjitech.com/web/buyer_api/test_login_with_openid.action" ;
-=======
 		String url = "http://test.mjtestritech.com/web/buyer_api/test_login_with_openid.action" ;
 		String url = "http://test.mjtestritech.com/web/buyer_api/test_login_with_openid.action" ;
->>>>>>> 4fff4323617d768dd0e82788992eeda74e1d0966
 		String body = "{\"openid\":\"o41Mgv5qXayH9P9C6IGYhN1Ujz3g\"}";
 		String body = "{\"openid\":\"o41Mgv5qXayH9P9C6IGYhN1Ujz3g\"}";
 		try {
 		try {
 			long startTime = System.currentTimeMillis();
 			long startTime = System.currentTimeMillis();

src/test/java/com/mjitech/qa/test/PickUpGoodsTest.java

@@ -116,15 +116,11 @@ public class PickUpGoodsTest {
 				+ "JSESSIONID=" + JSESSIONID;
 				+ "JSESSIONID=" + JSESSIONID;
 		System.out.println("CookiesValues=" + cookiesValues);
 		System.out.println("CookiesValues=" + cookiesValues);
 		OkHttpClient client = new OkHttpClient();
 		OkHttpClient client = new OkHttpClient();
-<<<<<<< HEAD
 		Request request = new Request.Builder().url("https://test.mjitech.com/web/pick_up_goods/50/80595").get()
 		Request request = new Request.Builder().url("https://test.mjitech.com/web/pick_up_goods/50/80595").get()
-=======
-		Request request = new Request.Builder().url("http://test.mjitech.com/web/pick_up_goods/52/86547").get()
 				// .addHeader("Cookie",
 				// .addHeader("Cookie",
 				// "mjitech_username='gangwang@mjitech.com';
 				// "mjitech_username='gangwang@mjitech.com';
 				// _ga=GA1.2.1640278628.1537349020;
 				// _ga=GA1.2.1640278628.1537349020;
 				// JSESSIONID=E0430372DC47BC880A93537AF0387924")
 				// JSESSIONID=E0430372DC47BC880A93537AF0387924")
->>>>>>> 4fff4323617d768dd0e82788992eeda74e1d0966
 				.addHeader("Cookie", cookiesValues).addHeader("cache-control", "no-cache")
 				.addHeader("Cookie", cookiesValues).addHeader("cache-control", "no-cache")
 				.addHeader("Postman-Token", "ee590a55-6c93-413b-b60b-21b4a88f38fe").build();
 				.addHeader("Postman-Token", "ee590a55-6c93-413b-b60b-21b4a88f38fe").build();
 		try {
 		try {