Commits · 057d0809077b731b6ae6fda5ab4774f05f8ec400 · 龚小红 / oto

20 Oct, 2021 2 commits
- 修改抽奖码数量校验、修复转盘抽奖的不能中奖的类型包含：1、2、4 · 057d0809
  龚小红 authored Oct 20, 2021
  
  057d0809
- 修改抽奖码数量校验、修复转盘抽奖的不能中奖的类型包含：1、2、4 · 366e70c9
  龚小红 authored Oct 20, 2021
  
  366e70c9
19 Oct, 2021 1 commit
- 修改测试用例描述 · ba1086cd
  龚小红 authored Oct 19, 2021
  
  ba1086cd
18 Oct, 2021 4 commits
- 修改测试用例描述 · ade9d905
  龚小红 authored Oct 18, 2021
  
  ade9d905
- Merge remote-tracking branch 'origin/master' · 1e594e1c
  龚小红 authored Oct 18, 2021
  
  1e594e1c
- 修改代理人首页的邀约奖励校验条件 · 27124cf9
  龚小红 authored Oct 18, 2021
  
  27124cf9
- Merge branch 'gifeature/20211015-gj' into 'master' · 8b6429a8
  龚小红 authored Oct 18, 2021
```
翻牌红包首邀+必得接口

See merge request test-group/kejiji!138
```
  8b6429a8
17 Oct, 2021 1 commit
- 翻牌红包首邀+必得接口 · 967b295e
  郭姣 authored Oct 17, 2021
  
  967b295e
15 Oct, 2021 4 commits
- 修改用例名称 · 511673dd
  龚小红 authored Oct 15, 2021
  
  511673dd
- Merge branch 'feat/20211014-xmc' into 'master' · 956c7eb1
  龚小红 authored Oct 15, 2021
```
Feat/20211014 xmc-秒杀限制需求覆盖

See merge request test-group/kejiji!136
```
  956c7eb1
- Merge branch 'Feature/20211014-gxh' into 'master' · 8c36baba
  龚小红 authored Oct 15, 2021
```
修改客户数量、视频列表数量校验并增加秒杀资格字段

See merge request test-group/kejiji!137
```
  8c36baba
- 修改客户数量、视频列表数量校验并增加秒杀资格字段 · 4f800dca
  龚小红 authored Oct 15, 2021
  
  4f800dca
14 Oct, 2021 6 commits
- 秒杀限制需求合入 · 02d4f861
  xiamengchen authored Oct 14, 2021
  
  02d4f861
- Merge branch 'master' into feat/20211014-xmc · 7f0d770b
  xiamengchen authored Oct 14, 2021
  
  7f0d770b
- Merge branch 'Feature/20211014-gxh' into 'master' · 0936b8b4
  龚小红 authored Oct 14, 2021
```
Feature/20211014 gxh

See merge request test-group/kejiji!135
```
  0936b8b4
- 合并绑定关系及到场关系 · c66024ac
  龚小红 authored Oct 14, 2021
  
  c66024ac
- Merge remote-tracking branch 'origin/master' into Feature/20211014-gxh · 70964afe
  龚小红 authored Oct 14, 2021
  
  70964afe
- 秒杀限制需求合入 · c615f189
  xiamengchen authored Oct 14, 2021
  
  c615f189
13 Oct, 2021 7 commits
- 合并绑定关系 · 97fc548b
  龚小红 authored Oct 13, 2021
  
  97fc548b
- 合并绑定关系 · 2801f097
  龚小红 authored Oct 13, 2021
  
  2801f097
- 合并绑定关系 · 42f1df2e
  龚小红 authored Oct 13, 2021
  
  42f1df2e
- Merge branch 'Feature/20211011-gxh' into 'master' · ca2bb3bf
  龚小红 authored Oct 13, 2021
```
修改提交中奖地址用例

See merge request test-group/kejiji!134
```
  ca2bb3bf
- Merge branch 'feat/20211013-xmc' into 'master' · 131275d6
  龚小红 authored Oct 13, 2021
```
代理人端改版需求合入

See merge request test-group/kejiji!133
```
  131275d6
- 修改提交中奖地址用例 · 1f402be2
  龚小红 authored Oct 13, 2021
  
  1f402be2
- 代理人端改版需求合入 · 5f44b8f4
  xiamengchen authored Oct 13, 2021
  
  5f44b8f4
11 Oct, 2021 1 commit
- 优化输出信息 · 0feab100
  龚小红 authored Oct 11, 2021
  
  0feab100
08 Oct, 2021 2 commits
- Merge branch 'Feature/20211008-gxh' into 'master' · 57234657
  龚小红 authored Oct 08, 2021
```
修改客户承诺话术

See merge request test-group/kejiji!132
```
  57234657
- 开启直播前增加校验是否有直播场次未结束 · fd99ce51
  龚小红 authored Oct 08, 2021
  
  fd99ce51
28 Sep, 2021 2 commits
- Merge branch 'Feature/20210926-gxh' into 'master' · 75edbf86
  龚小红 authored Sep 28, 2021
```
开启直播前增加校验是否有直播场次未结束

See merge request test-group/kejiji!131
```
  75edbf86
- 开启直播前增加校验是否有直播场次未结束 · bc45e333
  龚小红 authored Sep 28, 2021
  
  bc45e333
27 Sep, 2021 4 commits
- Merge branch 'Feature/20210926-gxh' into 'master' · a73cfae3
  龚小红 authored Sep 27, 2021
```
兑奖流程增加延时

See merge request test-group/kejiji!130
```
  a73cfae3
- 兑奖流程增加延时 · 5ab3e208
  龚小红 authored Sep 27, 2021
  
  5ab3e208
- Merge branch 'Feature/20210926-gxh' into 'master' · 6d92a5bf
  龚小红 authored Sep 27, 2021
```
增加收货地址的提交

See merge request test-group/kejiji!129
```
  6d92a5bf
- 增加收货地址的提交 · cae9328a
  龚小红 authored Sep 27, 2021
  
  cae9328a
26 Sep, 2021 6 commits
- Merge branch 'gifeature/20210924-gj' into 'master' · e411cadd
  龚小红 authored Sep 26, 2021
```
Gifeature/20210924 gj

See merge request test-group/kejiji!128
```
  e411cadd
- 翻牌红包等级优化接口 · 16cf5618
  郭姣 authored Sep 26, 2021
  
  16cf5618
- Merge branch 'master' into gifeature/20210924-gj · ac4118c7
  郭姣 authored Sep 26, 2021
```
# Conflicts:
#	src/test/liveTestNG.xml
```
  ac4118c7
- Merge branch 'Feature/20210926-gxh' into 'master' · 5889baec
  龚小红 authored Sep 26, 2021
```
Feature/20210926 gxh

See merge request test-group/kejiji!127
```
  5889baec
- 增加收货地址的提交 · 47a1e779
  龚小红 authored Sep 26, 2021
  
  47a1e779
- 增加收货地址的提交 · 19f9eefa
  龚小红 authored Sep 26, 2021
  
  19f9eefa