Commits · 2ce6c5d4ea9f1cf5fe18b9305a0d157da942d206 · haoban3.0 / haoban-manage3.0 · GitLab

15 Apr, 2020 21 commits
- 同步通讯录删除操作到暂存部门 · 2ce6c5d4
  fudahua authored Apr 15, 2020
  
  2ce6c5d4 Browse Files
- 同步通讯录同步判断 · 8c15754f
  fudahua authored Apr 15, 2020
  
  8c15754f Browse Files
- 同步通讯录同步判断 · 0bcf1597
  fudahua authored Apr 15, 2020
  
  0bcf1597 Browse Files
- 1111 · ac4682b6
  huangZW authored Apr 15, 2020
  
  ac4682b6 Browse Files
- 111 · 2b6d4173
  huangZW authored Apr 15, 2020
  
  2b6d4173 Browse Files
- 先暂时解决报错问题 · be67b0c5
  huangZW authored Apr 15, 2020
  
  be67b0c5 Browse Files
- 同步通讯录同步判断 · c1912e91
  fudahua authored Apr 15, 2020
  
  c1912e91 Browse Files
- 同步通讯录门店同步fix · 431a455a
  fudahua authored Apr 15, 2020
  
  431a455a Browse Files
- 同步通讯录门店同步fix · f3cc80f7
  fudahua authored Apr 15, 2020
  
  f3cc80f7 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 0c1dc7a5
  fudahua authored Apr 15, 2020
  
  0c1dc7a5 Browse Files
- 同步通讯录门店同步fix · 437c7e19
  fudahua authored Apr 15, 2020
  
  437c7e19 Browse Files
- Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer · 889a0101
  huangZW authored Apr 15, 2020
  
  889a0101 Browse Files
- 111 · ae267256
  huangZW authored Apr 15, 2020
  
  ae267256 Browse Files
- 同步通讯录新增成员 · 542d08a1
  fudahua authored Apr 15, 2020
  
  542d08a1 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 50510bef
  fudahua authored Apr 15, 2020
  
  50510bef Browse Files
- Merge branch 'contact-4-15' into developer · 22ab6b9c
```
# Conflicts:
#	haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/StaffApiService.java
```
  fudahua authored Apr 15, 2020
  22ab6b9c Browse Files
- 同步通讯录新增成员 · c0e8f8bd
  fudahua authored Apr 15, 2020
  
  c0e8f8bd Browse Files
- 111 · 13cc1c78
  huangZW authored Apr 15, 2020
  
  13cc1c78 Browse Files
- 111 · 554087b1
  huangZW authored Apr 15, 2020
  
  554087b1 Browse Files
- 111 · 9e3440cf
  huangZW authored Apr 15, 2020
  
  9e3440cf Browse Files
- 新增接口获取wxUserId · 55a2cebb
  huangZW authored Apr 15, 2020
  
  55a2cebb Browse Files
14 Apr, 2020 19 commits
- 同步优化初步3-同步成员重试 · fa69ad3c
  fudahua authored Apr 14, 2020
  
  fa69ad3c Browse Files
- 同步优化初步3-同步成员重试 · 34662b8e
  fudahua authored Apr 14, 2020
  
  34662b8e Browse Files
- 同步优化初步3-同步成员重试 · 4c0a2643
  fudahua authored Apr 14, 2020
  
  4c0a2643 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · ee6c54c8
  fudahua authored Apr 14, 2020
  
  ee6c54c8 Browse Files
- 同步优化初步3-同步成员重试 · 8a9d0bd5
  fudahua authored Apr 14, 2020
  
  8a9d0bd5 Browse Files
- Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer · 863a132b
  qwmqiuwenmin authored Apr 14, 2020
  
  863a132b Browse Files
- Merge branch 'master' into 'developer' · 24c2b2ad
```
fix

See merge request !45
```
  qwmqiuwenmin authored Apr 14, 2020
  24c2b2ad Browse Files
- fix · d02be358
  qwmqiuwenmin authored Apr 14, 2020
  
  d02be358 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 24449190
  fudahua authored Apr 14, 2020
  
  24449190 Browse Files
- 同步优化初步3-同步成员重试 · a27d133e
  fudahua authored Apr 14, 2020
  
  a27d133e Browse Files
- Merge branch 'contact-4-14' into 'developer' · c0f22f71
```
Contact 4 14

See merge request !44
```
  qwmqiuwenmin authored Apr 14, 2020
  c0f22f71 Browse Files
- Merge branch 'developer' into 'contact-4-14' · 35f158f8
```
# Conflicts:
#   haoban-manage3-api/src/main/java/com/gic/haoban/manage/api/service/DepartmentApiService.java
#   haoban-manage3-service/src/main/java/com/gic/haoban/manage/service/service/out/impl/DepartmentApiServiceImpl.java
```
  qwmqiuwenmin authored Apr 14, 2020
  35f158f8 Browse Files
- fix · 614b742f
  qwmqiuwenmin authored Apr 14, 2020
  
  614b742f Browse Files
- fix · 1bf76dea
  qwmqiuwenmin authored Apr 14, 2020
  
  1bf76dea Browse Files
- fix · 5d97088f
  qwmqiuwenmin authored Apr 14, 2020
  
  5d97088f Browse Files
- 同步优化初步3-同步成员 · 91ffd3ef
  fudahua authored Apr 14, 2020
  
  91ffd3ef Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 777ac1f2
  fudahua authored Apr 14, 2020
  
  777ac1f2 Browse Files
- 同步优化初步3-同步成员 · 91f701a5
  fudahua authored Apr 14, 2020
  
  91f701a5 Browse Files
- fix · 1a16783d
  qwmqiuwenmin authored Apr 14, 2020
  
  1a16783d Browse Files