Commits · 33a84533edcdfce0be9b22a5c652f61a908066e1 · 龚小红 / oto

30 Jul, 2021 13 commits
- Merge branch 'feature/20210730-xmc' into 'master' · 33a84533
  张艳玲 authored Jul 30, 2021
```
删除多余导包

See merge request test-group/kejiji!87
```
  33a84533
- 删除多余导包 · 8375f897
  xiamengchen authored Jul 30, 2021
  
  8375f897
- Merge branch 'feature/20210730-xmc' into 'master' · 6dc8b3d9
  张艳玲 authored Jul 30, 2021
```
Feature/20210730 xmc

See merge request test-group/kejiji!86
```
  6dc8b3d9
- Merge branch 'master' into feature/20210730-xmc · b2643e61
  xiamengchen authored Jul 30, 2021
  
  b2643e61
- Merge branch 'gifeature/20210726-gj' into 'master' · c7c5f249
  张艳玲 authored Jul 30, 2021
```
上传链接接口用例修改

See merge request test-group/kejiji!84
```
  c7c5f249
- 更新谁看过我+我的客户(更新xml文件) · 53c80cba
  xiamengchen authored Jul 30, 2021
  
  53c80cba
- 更新谁看过我+我的客户 · 872d7b46
  xiamengchen authored Jul 30, 2021
  
  872d7b46
- 上传链接接口用例修改 · 7ff7c44c
  郭姣 authored Jul 30, 2021
  
  7ff7c44c
- 新增我的客户 · d34ad305
  xiamengchen authored Jul 30, 2021
  
  d34ad305
- Merge branch 'master' into feature/20210729-xmc · d54a8ec8
  xiamengchen authored Jul 30, 2021
  
  d54a8ec8
- 新增我的客户 · 89e3c91b
  xiamengchen authored Jul 30, 2021
  
  89e3c91b
- 新增授权弹窗update · 525d02f9
  张艳玲 authored Jul 30, 2021
  
  525d02f9
- 新增授权弹窗update · 3a226622
  张艳玲 authored Jul 30, 2021
  
  3a226622
29 Jul, 2021 11 commits
- 新增我的客户 · 91e2ce3e
  xiamengchen authored Jul 29, 2021
  
  91e2ce3e
- Merge branch 'master' into feature/20210729-xmc · e5dde0b5
  xiamengchen authored Jul 29, 2021
  
  e5dde0b5
- 新增授权弹窗+准客户管理后台接口 · fd6c9a1b
  张艳玲 authored Jul 29, 2021
  
  fd6c9a1b
- 新增授权弹窗+准客户管理后台接口 · f2a7b003
  张艳玲 authored Jul 29, 2021
  
  f2a7b003
- Merge branch 'gifeature/20210726-gj' into 'master' · bcaca2bf
  张艳玲 authored Jul 29, 2021
```
Gifeature/20210726 gj

See merge request test-group/kejiji!83
```
  bcaca2bf
- 成功案例，上传链接接口用例修改 · 762f8388
  郭姣 authored Jul 29, 2021
  
  762f8388
- Merge branch 'master' into feature/20210728-xmc · 0007c990
  xiamengchen authored Jul 29, 2021
  
  0007c990
- 新增我的客户 · 63e9681a
  xiamengchen authored Jul 29, 2021
  
  63e9681a
- 成功案例，上传链接接口用例修改 · 1890fa7b
  郭姣 authored Jul 29, 2021
  
  1890fa7b
- Merge branch 'master' into gifeature/20210726-gj · fef6fc35
  郭姣 authored Jul 29, 2021
```
# Conflicts:
#	src/test/java/com/kjj/cases/assistant/homePage/HomePage.java
#	src/test/java/com/kjj/config/BasicConfig.java
```
  fef6fc35
- 成功案例，上传链接接口用例修改 · 653a7c78
  郭姣 authored Jul 29, 2021
  
  653a7c78
28 Jul, 2021 12 commits
- 更新翻牌集字 · d9fee805
  张艳玲 authored Jul 28, 2021
  
  d9fee805
- Merge branch 'master' into feature/20210728-xmc · 1f474103
  xiamengchen authored Jul 28, 2021
  
  1f474103
- 代码存档 · dca41b4a
  xiamengchen authored Jul 28, 2021
  
  dca41b4a
- 邀请返现 · 556e946a
  张艳玲 authored Jul 28, 2021
  
  556e946a
- 代码存档 · 6b5824ad
  xiamengchen authored Jul 28, 2021
  
  6b5824ad
- 代码存档 · 5e6a7d12
  xiamengchen authored Jul 28, 2021
  
  5e6a7d12
- 去掉无用接口 · 4254bf77
  张艳玲 authored Jul 28, 2021
  
  4254bf77
- 去掉无用接口 · 52feb3ca
  张艳玲 authored Jul 28, 2021
  
  52feb3ca
- 去掉无用接口 · 102e0f68
  张艳玲 authored Jul 28, 2021
  
  102e0f68
- 去掉无用接口 · 463d2556
  张艳玲 authored Jul 28, 2021
  
  463d2556
- 集客助手用户相关 · eb1e5eb8
  张艳玲 authored Jul 28, 2021
  
  eb1e5eb8
- Merge branch '2021072702-gxh' into 'master' · 2accc348
  张艳玲 authored Jul 28, 2021
```
2021072702 gxh

See merge request test-group/kejiji!82
```
  2accc348
27 Jul, 2021 4 commits
- Merge remote-tracking branch 'origin/master' into 2021072701_gxh · 28aab9aa
  龚小红 authored Jul 27, 2021
```
# Conflicts:
#	src/test/java/com/kjj/cases/assistant/card/ArticalPersonCard.java
#	src/test/java/com/kjj/cases/assistant/card/PersonCard.java
#	src/test/java/com/kjj/config/BasicConfig.java
```
  28aab9aa
- 添加抽奖转盘的相关用例，修改部分用例名称 · 5bc303ac
  龚小红 authored Jul 27, 2021
  
  5bc303ac
- 集客助手支付相关 · 80696635
  张艳玲 authored Jul 27, 2021
  
  80696635
- 集客助手支付相关 · 26152974
  张艳玲 authored Jul 27, 2021
  
  26152974