Commits · 838a83691d7ae25781c06b45f366b1f4de8c64fe · 龚小红 / oto

26 Mar, 2021 1 commit

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

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 2 commits
- Merge branch '20210315_zz' into 'master' · 900651c2
  张艳玲 authored Mar 15, 2021
```
修改boss看板tku

See merge request test-group/kejiji!33
```
  900651c2
- 修改boss看板tku · db403484
  张震 authored Mar 15, 2021
  
  db403484
12 Mar, 2021 7 commits
- Merge branch 'Feature/20210312_zz' into 'master' · 561d8af6
  张艳玲 authored Mar 12, 2021
```
钉钉推送

See merge request test-group/kejiji!32
```
  561d8af6
- 钉钉推送 · 8bfd2dc4
  张震 authored Mar 12, 2021
  
  8bfd2dc4
- Merge branch 'Feature/20210312_zz' into 'master' · f5f10cad
  张艳玲 authored Mar 12, 2021
```
修改boss看板逻辑

See merge request test-group/kejiji!31
```
  f5f10cad
- 修改boss看板逻辑 · 7ee0dad7
  张震 authored Mar 12, 2021
  
  7ee0dad7
- Merge branch 'feature/20210312-bxl' into 'master' · 3fe24467
  张艳玲 authored Mar 12, 2021
```
Feature/20210312 bxl

See merge request test-group/kejiji!30
```
  3fe24467
- 代理人首页 · d9bf3ead
  别湘灵 authored Mar 12, 2021
  
  d9bf3ead
- Merge remote-tracking branch 'origin/master' · e346f781
  别湘灵 authored Mar 12, 2021
  
  e346f781
10 Mar, 2021 1 commit
- update · ce01862a
  张艳玲 authored Mar 10, 2021
  
  ce01862a
09 Mar, 2021 1 commit
- update · fa12334e
  张艳玲 authored Mar 09, 2021
  
  fa12334e
08 Mar, 2021 2 commits
- Merge branch 'master' of /Users/biexiangling/Documents/kejiji with conflicts. · f2c7b424
  别湘灵 authored Mar 08, 2021
  
  f2c7b424
- mvn · 4632584d
  张艳玲 authored Mar 08, 2021
  
  4632584d