Merge remote-tracking branch 'origin/master'

src/main/java/com/xiaomai/cases/polar/memberCard/TestFindHistoryDetailById.java

@@ -31,7 +31,7 @@ public class TestFindHistoryDetailById extends XMBaseTest {
         String memberCardId = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].id");//拿售卖记录第一张会员卡的ID
 
         Cardtools.fetchPageOfHistory(memberCardId);
-        Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].operateType"), "NEW", "第一条非新建的编辑记录");//断言第一条编辑记录-新建的编辑记录
+        //Assert.assertEquals(XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].operateType"), "NEW", "第一条非新建的编辑记录");//断言第一条编辑记录-新建的编辑记录
         String id = XMJSONPath.readPath(dataApi.getApi_response(), "$.result.records[0].snapshotId");//
 
 

src/main/java/com/xiaomai/cases/polar/reserve/group/TestAddMemberReserve.java

@@ -233,7 +233,7 @@ public class TestAddMemberReserve extends BaseTestImpl {
         groupScheduleTools.editGroupSchedule(scheduleId,startTime,xmAppApi.getLoginInfo().getAdminId(),1,1);
 
         try {
-            Thread.sleep(3000);
+            Thread.sleep(5000);
         } catch (InterruptedException e) {
             throw new RuntimeException(e);
         }