Commits · 5f9186a8acf908e9b91cc336775194270cbd8962 · 龚小红 / oto

29 Mar, 2021 5 commits
- 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 9 commits
- Merge branch 'Feature/20210325_zz' into 'master' · dd82d44a
  张艳玲 authored Mar 25, 2021
```
新增代理人排行榜及我的客户列表

See merge request test-group/kejiji!36
```
  dd82d44a
- 新增代理人排行榜及我的客户列表 · 04bde0f0
  张震 authored Mar 25, 2021
  
  04bde0f0
- update · 8cd685e7
  张艳玲 authored Mar 25, 2021
  
  8cd685e7
- update · e8ea1d47
  张艳玲 authored Mar 25, 2021
  
  e8ea1d47
- update · 1b9741b2
  张艳玲 authored Mar 25, 2021
  
  1b9741b2
- update · cb6e0544
  张艳玲 authored Mar 25, 2021
  
  cb6e0544
- update · 94bcd229
  张艳玲 authored Mar 25, 2021
  
  94bcd229
- update · 39248227
  张艳玲 authored Mar 25, 2021
  
  39248227
- update · 19244246
  张艳玲 authored Mar 25, 2021
  
  19244246
24 Mar, 2021 1 commit
- update · 7a71224b
  张艳玲 authored Mar 24, 2021
  
  7a71224b
22 Mar, 2021 4 commits
- Merge branch 'master' of /Users/biexiangling/Documents/kejiji with conflicts. · 06420dbc
  别湘灵 authored Mar 22, 2021
  
  06420dbc
- Merge remote-tracking branch 'origin/master' · 44681908
  别湘灵 authored Mar 22, 2021
  
  44681908
- update · 7758492b
  张艳玲 authored Mar 22, 2021
  
  7758492b
- update · e1fcc804
  张艳玲 authored Mar 22, 2021
  
  e1fcc804
19 Mar, 2021 5 commits
- Merge remote-tracking branch 'origin/master' · 3523be8d
  张艳玲 authored Mar 19, 2021
  
  3523be8d
- update · 89ba5620
  张艳玲 authored Mar 19, 2021
  
  89ba5620
- Merge branch 'Feature/20210319_zz' into 'master' · 8cc5241c
  张艳玲 authored Mar 19, 2021
```
修改名片逻辑

See merge request test-group/kejiji!35
```
  8cc5241c
- 修改名片逻辑 · 8e52a065
  张震 authored Mar 19, 2021
  
  8e52a065
- Merge branch 'master' of /Users/biexiangling/Documents/kejiji with conflicts. · 4709658c
  别湘灵 authored Mar 19, 2021
  
  4709658c
18 Mar, 2021 2 commits
- update · ba4316d5
  张艳玲 authored Mar 18, 2021
  
  ba4316d5
- update · 9bd9a213
  张艳玲 authored Mar 18, 2021
  
  9bd9a213
17 Mar, 2021 2 commits
- update · 8c6caa31
  张艳玲 authored Mar 17, 2021
  
  8c6caa31
- update · 84796c3c
  张艳玲 authored Mar 17, 2021
  
  84796c3c
16 Mar, 2021 3 commits
- Merge branch 'Feature/20210316_zz' into 'master' · aa65d808
  张艳玲 authored Mar 16, 2021
```
Feature/20210316 zz

See merge request test-group/kejiji!34
```
  aa65d808
- 修改boss看板tku · 80cd8c96
  张震 authored Mar 16, 2021
  
  80cd8c96
- 修改boss看板tku · 1a1c4ca7
  张震 authored Mar 16, 2021
  
  1a1c4ca7
15 Mar, 2021 1 commit
- Merge branch '20210315_zz' into 'master' · 900651c2
  张艳玲 authored Mar 15, 2021
```
修改boss看板tku

See merge request test-group/kejiji!33
```
  900651c2