Commits · 8ca1b14efda06b21ae257bdc09dbdb67f9554e99 · 8timerv2 / 8timerapiv200

08 Aug, 2020 7 commits
- 提交 · 8ca1b14e
  ilal committed Aug 08, 2020
  
  8ca1b14e Browse Files
- 提交 · c3b6a3c1
  ilal committed Aug 08, 2020
  
  c3b6a3c1 Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal · 47cfa9da
  ilal committed Aug 08, 2020
  
  47cfa9da Browse Files
- 提交 · a35c04fa
  ilal committed Aug 08, 2020
  
  a35c04fa Browse Files
- Merge branch 'develop_zyq' into 'develop' · fdb5f1a7
```
Develop zyq

See merge request 8timerv2/8timerapiv200!400
```
  Administrator committed Aug 08, 2020
  fdb5f1a7 Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into develop_zyq · b24f2982
  yuquan.zhu committed Aug 08, 2020
  
  b24f2982 Browse Files
- 修改bug！ · e6b19807
  yuquan.zhu committed Aug 08, 2020
  
  e6b19807 Browse Files
07 Aug, 2020 21 commits
- Merge branch 'lal' into 'develop' · c947f2e3
```
提交

See merge request 8timerv2/8timerapiv200!399
```
  leialin committed Aug 07, 2020
  c947f2e3 Browse Files
- 提交 · d1e0126e
  ilal committed Aug 07, 2020
  
  d1e0126e Browse Files
- Merge branch 'lal' into 'develop' · 02ac86e5
```
Lal

See merge request 8timerv2/8timerapiv200!398
```
  leialin committed Aug 07, 2020
  02ac86e5 Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal · 523f46df
  ilal committed Aug 07, 2020
  
  523f46df Browse Files
- 提交 · e8c9ce13
  ilal committed Aug 07, 2020
  
  e8c9ce13 Browse Files
- Merge branch 'lal' into 'develop' · b74b5253
```
提交

See merge request 8timerv2/8timerapiv200!397
```
  leialin committed Aug 07, 2020
  b74b5253 Browse Files
- 提交 · 99db0946
  ilal committed Aug 07, 2020
  
  99db0946 Browse Files
- Merge branch 'lal' into 'develop' · 24388f9c
```
Lal

See merge request 8timerv2/8timerapiv200!396
```
  leialin committed Aug 07, 2020
  24388f9c Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal · e7a1c773
  ilal committed Aug 07, 2020
  
  e7a1c773 Browse Files
- 提交 · d5264a36
  ilal committed Aug 07, 2020
  
  d5264a36 Browse Files
- Merge branch 'lal' into 'develop' · de6c3d6c
```
提交

See merge request 8timerv2/8timerapiv200!395
```
  leialin committed Aug 07, 2020
  de6c3d6c Browse Files
- 提交 · aa12a305
  ilal committed Aug 07, 2020
  
  aa12a305 Browse Files
- Merge branch 'develop_zyq' into 'develop' · f2e0d3e2
```
离职删除token

See merge request 8timerv2/8timerapiv200!394
```
  Administrator committed Aug 07, 2020
  f2e0d3e2 Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into develop_zyq · f0ae2866
  yuquan.zhu committed Aug 07, 2020
  
  f0ae2866 Browse Files
- 离职删除token · e78cc420
  yuquan.zhu committed Aug 07, 2020
  
  e78cc420 Browse Files
- Merge branch 'develop_zyq' into 'develop' · d190c149
```
Develop zyq

See merge request 8timerv2/8timerapiv200!393
```
  Administrator committed Aug 07, 2020
  d190c149 Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into develop_zyq · 4c3ddfe4
  yuquan.zhu committed Aug 07, 2020
  
  4c3ddfe4 Browse Files
- 修改离职提示语 · d5c813ad
  yuquan.zhu committed Aug 07, 2020
  
  d5c813ad Browse Files
- 加入redis实现离职员工block · 143b2d3e
  yuquan.zhu committed Aug 07, 2020
  
  143b2d3e Browse Files
- Merge branch 'lal' into 'develop' · 9ff4824b
```
提交

See merge request 8timerv2/8timerapiv200!392
```
  leialin committed Aug 07, 2020
  9ff4824b Browse Files
- 提交 · 3b645bf7
  ilal committed Aug 07, 2020
  
  3b645bf7 Browse Files
06 Aug, 2020 11 commits
- Merge branch 'lal' into 'develop' · 9c09c7ef
```
提交

See merge request 8timerv2/8timerapiv200!391
```
  leialin committed Aug 06, 2020
  9c09c7ef Browse Files
- 提交 · 9821d122
  ilal committed Aug 06, 2020
  
  9821d122 Browse Files
- Merge branch 'lal' into 'develop' · 87ed9da2
```
提交

See merge request 8timerv2/8timerapiv200!390
```
  leialin committed Aug 06, 2020
  87ed9da2 Browse Files
- 提交 · 3e4b6e6b
  ilal committed Aug 06, 2020
  
  3e4b6e6b Browse Files
- Merge branch 'lal' into 'develop' · 9fc0f401
```
提交

See merge request 8timerv2/8timerapiv200!389
```
  leialin committed Aug 06, 2020
  9fc0f401 Browse Files
- 提交 · 3e2d4937
  ilal committed Aug 06, 2020
  
  3e2d4937 Browse Files
- Merge branch 'lal' into 'develop' · c8c635df
```
Lal

See merge request 8timerv2/8timerapiv200!388
```
  leialin committed Aug 06, 2020
  c8c635df Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal · 9c972e58
  ilal committed Aug 06, 2020
  
  9c972e58 Browse Files
- 提交 · 3564611f
  ilal committed Aug 06, 2020
  
  3564611f Browse Files
- Merge branch 'lal' into 'develop' · af716fbb
```
提交

See merge request 8timerv2/8timerapiv200!387
```
  leialin committed Aug 06, 2020
  af716fbb Browse Files
- 提交 · 5b039aea
  ilal committed Aug 06, 2020
  
  5b039aea Browse Files
05 Aug, 2020 1 commit
- Merge branch 'lal' into 'develop' · e11823a8
```
Lal

See merge request 8timerv2/8timerapiv200!386
```
  leialin committed Aug 05, 2020
  e11823a8 Browse Files