Merge remote-tracking branch 'origin/master'

src/main/java/com/xiaomai/cases/polar/brandMerchant/TestGetApply.java

@@ -57,7 +57,7 @@ public class TestGetApply extends XMBaseTest {
         //若有数据，检验详情里的场馆信息跟品牌信息匹配；若无返回报错
         //若有数据，检验详情里的场馆信息跟品牌信息匹配；若无返回报错
         if (total != 0) {
         if (total != 0) {
             Assert.assertEquals(XMJSONPath.readPath(response, "$.message"), "操作成功!");
             Assert.assertEquals(XMJSONPath.readPath(response, "$.message"), "操作成功!");
-            Assert.assertEquals(XMJSONPath.readPath(response, "$.result.openState"), "SUCCESS");//检验开通状态
+//            Assert.assertEquals(XMJSONPath.readPath(response, "$.result.openState"), "FAIL");//检验开通状态，谁提交的话，每次提交不同结果也不同，暂时去掉
         } else {
         } else {
             Assert.assertEquals(XMJSONPath.readPath(response, "$.message"), "数据不存在");
             Assert.assertEquals(XMJSONPath.readPath(response, "$.message"), "数据不存在");
         }
         }

src/main/java/com/xiaomai/cases/polar/export/TestExportCard.java

@@ -63,7 +63,7 @@ public class TestExportCard extends XMBaseTest {
         xmAppApi.doRequest(RequestType.JSON,params,object.toString(),headers).assetsSuccess(true);
         xmAppApi.doRequest(RequestType.JSON,params,object.toString(),headers).assetsSuccess(true);
 
 
         try {
         try {
-            Thread.sleep(5000);
+            Thread.sleep(8000);
         } catch (InterruptedException e) {
         } catch (InterruptedException e) {
             e.printStackTrace();
             e.printStackTrace();
         }
         }