add

src/test/java/http/cases/PkTest/pk_开奖_瓜分红包测试.java

@@ -62,8 +62,12 @@ public class pk_开奖_瓜分红包测试 extends DuibaTestBase {
 
 
     @BeforeMethod
+<<<<<<< HEAD
     //注意初始化的方法不能与父类的相同，会被覆盖住
     public void setUpPkActivity() {
+=======
+    public void beforeMethod() {
+>>>>>>> f87a2c6084a3908a60a5357c6907d3fbe4887970
 
         try {
             createPk("2","2020-08-12 00:00:00",groupId);
@@ -76,6 +80,7 @@ public class pk_开奖_瓜分红包测试 extends DuibaTestBase {
 
     @Test
     public void 瓜分红包_两个选项_押注人数相同_开奖测试() throws Exception{
+        System.out.println("1");
 
         Response betList = pkService.getBetList(3445);
         List<BetMobileVo> betMobileVoList = betList.jsonPath().getList("data.unbetList",BetMobileVo.class);