Merge branch 'master' into develop

src/test/java/http/cases/SeckillTest/兑吧_实物秒杀商品兑换测试_SeckillTest.java

@@ -50,7 +50,7 @@ public class 兑吧_实物秒杀商品兑换测试_SeckillTest extends DuibaTest
 
         try {
 
-            Map<String,String> map = CheckPublic.beforeGet(jdbc,"consumer_0010",String.valueOf(uid_Nomal),20);
+            Map<String,String> map = CheckPublic.beforeGet(jdbc,"consumer_0010",String.valueOf(uid_Nomal),2);
 
 
             Map<String,Object>  itemStockResult = jdbc.findSimpleResult("select * from stock.tb_stock where stock_id in (select stock_id from goods.item where id = ?)\n","28205");