Commits · 1592ebb482ad770f79e12048be649b09ef7eedc7 · 龚小红 / oto

12 Apr, 2021 6 commits
- Merge branch '20210412bxl' into 'master' · 1592ebb4
  张艳玲 authored Apr 12, 2021
```
有奖答题

See merge request test-group/kejiji!46
```
  1592ebb4
- 代理人首页 · 9c33f7aa
  别湘灵 authored Apr 12, 2021
  
  9c33f7aa
- Merge branch '20210412bxl' into 'master' · 94b01465
  张艳玲 authored Apr 12, 2021
```
红包

See merge request test-group/kejiji!45
```
  94b01465
- 代理人首页 · d7a683cd
  别湘灵 authored Apr 12, 2021
  
  d7a683cd
- 代理人首页 · 15b684e2
  别湘灵 authored Apr 12, 2021
  
  15b684e2
- update · d454d407
  张艳玲 authored Apr 12, 2021
  
  d454d407
09 Apr, 2021 6 commits
- Merge branch '20210409bxl1' into 'master' · 4dc1ca5c
  张艳玲 authored Apr 09, 2021
```
20210409bxl1

See merge request test-group/kejiji!44
```
  4dc1ca5c
- 代理人首页 · 704c5b14
  别湘灵 authored Apr 09, 2021
  
  704c5b14
- 代理人首页 · f935bb4b
  别湘灵 authored Apr 09, 2021
  
  f935bb4b
- 代理人首页 · 457be849
  别湘灵 authored Apr 09, 2021
  
  457be849
- Merge remote-tracking branch 'origin/master' · dc993508
  别湘灵 authored Apr 09, 2021
```
# Conflicts:
#	src/test/liveTestNG.xml
```
  dc993508
- 代理人首页 · c017c078
  别湘灵 authored Apr 09, 2021
  
  c017c078
08 Apr, 2021 1 commit
- update · 73cb6da5
  张艳玲 authored Apr 08, 2021
  
  73cb6da5
07 Apr, 2021 1 commit
- update · a4b781d8
  张艳玲 authored Apr 07, 2021
  
  a4b781d8
06 Apr, 2021 1 commit
- update · a04efa8d
  张艳玲 authored Apr 06, 2021
  
  a04efa8d
01 Apr, 2021 4 commits
- Merge remote-tracking branch 'origin/master' · d01380e9
  张慧锋 authored Apr 01, 2021
  
  d01380e9
- 注释优惠券付费 · c0a8259e
  张慧锋 authored Apr 01, 2021
  
  c0a8259e
- Merge branch 'Feature/20210401_zz' into 'master' · e015929d
  张慧锋 authored Apr 01, 2021
```
完善代理人排行榜、我的客户逻辑；解决线上报错

See merge request test-group/kejiji!42
```
  e015929d
- 完善代理人排行榜、我的客户逻辑；解决线上报错 · a202a167
  张震 authored Apr 01, 2021
  
  a202a167
29 Mar, 2021 12 commits
- update · 8cb87fa7
  张艳玲 authored Mar 29, 2021
  
  8cb87fa7
- Merge branch '20210329bxl' into 'master' · 1abd5758
  张艳玲 authored Mar 29, 2021
```
20210329bxl

See merge request test-group/kejiji!41
```
  1abd5758
- Merge branch 'master' into '20210329bxl' · 7abc3049
  张艳玲 authored Mar 29, 2021
```
# Conflicts:
#   src/test/java/com/kjj/cases/live/LiveVisitors.java
#   src/test/liveTestNG.xml
```
  7abc3049
- 代理人首页 · 239b7ea5
  别湘灵 authored Mar 29, 2021
  
  239b7ea5
- 代理人首页 · 89584a85
  别湘灵 authored Mar 29, 2021
  
  89584a85
- 代理人首页 · 76f8fa1c
  别湘灵 authored Mar 29, 2021
  
  76f8fa1c
- update · 2e0f515c
  张艳玲 authored Mar 29, 2021
  
  2e0f515c
- Merge branch '20210329bxl' into 'master' · 5f9186a8
  张艳玲 authored Mar 29, 2021
```
20210329bxl

See merge request test-group/kejiji!37
```
  5f9186a8
- 代理人首页 · 778dbcc6
  别湘灵 authored Mar 29, 2021
  
  778dbcc6
- 代理人首页 · 746e937b
  别湘灵 authored Mar 29, 2021
  
  746e937b
- Merge remote-tracking branch 'origin/master' · 1d80764e
  别湘灵 authored Mar 29, 2021
  
  1d80764e
- update · a6f97eba
  张艳玲 authored Mar 29, 2021
  
  a6f97eba
26 Mar, 2021 8 commits
- Merge remote-tracking branch 'origin/master' · ac4e862f
  别湘灵 authored Mar 26, 2021
```
# Conflicts:
#	src/test/java/com/kjj/config/BasicConfig.java
#	src/test/liveTestNG.xml
```
  ac4e862f
- update · 8d36761e
  张艳玲 authored Mar 26, 2021
  
  8d36761e
- update · 48df3950
  张艳玲 authored Mar 26, 2021
  
  48df3950
- Merge remote-tracking branch 'origin/master' · ebec9366
  张艳玲 authored Mar 26, 2021
  
  ebec9366
- update · fa19d1a8
  张艳玲 authored Mar 26, 2021
  
  fa19d1a8
- Merge remote-tracking branch 'origin/master' · 3883c650
  别湘灵 authored Mar 26, 2021
  
  3883c650
- Merge remote-tracking branch 'origin/master' · 838a8369
  别湘灵 authored Mar 26, 2021
```
# Conflicts:
#	.idea/compiler.xml
#	src/test/java/com/kjj/config/BasicConfig.java
#	src/test/liveTestNG.xml
```
  838a8369
- update · e3b57221
  张艳玲 authored Mar 26, 2021
  
  e3b57221
25 Mar, 2021 1 commit
- Merge branch 'Feature/20210325_zz' into 'master' · dd82d44a
  张艳玲 authored Mar 25, 2021
```
新增代理人排行榜及我的客户列表

See merge request test-group/kejiji!36
```
  dd82d44a