Merge branch 'pyl' into 'master'

核销二期代码二期权益已过期以及未开始的代码

See merge request !1

src/test/java/http/cases/equitySubjectTest/权益二期线上用户核销匹配权益及兑换码兑换_DuibaTest.java

@@ -154,7 +154,7 @@ public class 权益二期线上用户核销匹配权益及兑换码兑换_DuibaT
     String desc = response.jsonPath().getString("desc");
     logger.info("code:"+code+",desc:"+desc);
     //校验
-    Assert.assertEquals(code,"1001003","ZDH权益已过期  有问题" );
+    Assert.assertEquals(code,"1001029","ZDH权益已过期  有问题" );
     response.prettyPrint();
     logger.info(" ZDH核销二期权益已过期-->结束了");
 }
@@ -286,7 +286,7 @@ public class 权益二期线上用户核销匹配权益及兑换码兑换_DuibaT
         String desc = response.jsonPath().getString("desc");
         logger.info("code:"+code+",desc:"+desc);
         //校验
-        Assert.assertEquals(code,"1001002","2-ZDH权益未开始进行兑换(  有问题" );
+        Assert.assertEquals(code,"1001028","2-ZDH权益未开始进行兑换(  有问题" );
         response.prettyPrint();
         logger.info(" 2-ZDH权益未开始进行兑换(-->结束了");
     }