Commits · fa69ad3c3a644b8653d2a9f413f64c2a2a2479d1 · haoban3.0 / haoban-manage3.0 · GitLab

14 Apr, 2020 40 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
- fix · 0a195449
  qwmqiuwenmin authored Apr 14, 2020
  
  0a195449 Browse Files
- 同步优化初步3-同步成员 · d0ae2cbb
  fudahua authored Apr 14, 2020
  
  d0ae2cbb Browse Files
- fix · 4980433b
  qwmqiuwenmin authored Apr 14, 2020
  
  4980433b Browse Files
- fix · 1abb1f6d
  qwmqiuwenmin authored Apr 14, 2020
  
  1abb1f6d Browse Files
- fix · dcaafc0b
  qwmqiuwenmin authored Apr 14, 2020
  
  dcaafc0b Browse Files
- Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer · b0071dbd
  qwmqiuwenmin authored Apr 14, 2020
  
  b0071dbd Browse Files
- fix · b4647506
  qwmqiuwenmin authored Apr 14, 2020
  
  b4647506 Browse Files
- fix · 38cb7761
  qwmqiuwenmin authored Apr 14, 2020
  
  38cb7761 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · d0bac6c1
  fudahua authored Apr 14, 2020
  
  d0bac6c1 Browse Files
- 同步优化初步3-同步成员 · 9738d7c4
  fudahua authored Apr 14, 2020
  
  9738d7c4 Browse Files
- fix · 0b2db316
  qwmqiuwenmin authored Apr 14, 2020
  
  0b2db316 Browse Files
- fix · 2bcab31f
  qwmqiuwenmin authored Apr 14, 2020
  
  2bcab31f Browse Files
- fix · 2efab000
  qwmqiuwenmin authored Apr 14, 2020
  
  2efab000 Browse Files
- fix · cd3cf195
  qwmqiuwenmin authored Apr 14, 2020
  
  cd3cf195 Browse Files
- fix · 29c82f89
  qwmqiuwenmin authored Apr 14, 2020
  
  29c82f89 Browse Files
- Merge branch 'developer' of http://115.159.76.241/haoban3.0/haoban-manage3.0.git into developer · 660fb7b1
  qwmqiuwenmin authored Apr 14, 2020
  
  660fb7b1 Browse Files
- fix · 9619c1f8
  qwmqiuwenmin authored Apr 14, 2020
  
  9619c1f8 Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · ee3f677c
  fudahua authored Apr 14, 2020
  
  ee3f677c Browse Files
- 同步优化初步3-同步成员 · e302c82b
  fudahua authored Apr 14, 2020
  
  e302c82b Browse Files
- fix · 034de0df
  qwmqiuwenmin authored Apr 14, 2020
  
  034de0df Browse Files
- Merge remote-tracking branch 'origin/developer' into developer · 30789641
  fudahua authored Apr 14, 2020
  
  30789641 Browse Files