Commits · d84fc3b5acd583d4865290ae16360898f48e3598 · 8timerv2 / 8timerapiv200 · GitLab

04 Jul, 2020 12 commits
- Merge branch 'lal' into 'develop' · d84fc3b5
```
Lal

See merge request 8timerv2/8timerapiv200!304
```
  leialin committed Jul 04, 2020
  d84fc3b5 Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal · d810bdfe
  lal committed Jul 04, 2020
  
  d810bdfe Browse Files
- 修复BUG · 455fd2b1
  lal committed Jul 04, 2020
  
  455fd2b1 Browse Files
- 提交 · 7322cf5d
  lal committed Jul 04, 2020
  
  7322cf5d Browse Files
- Merge branch 'lal' into 'develop' · 99bbb8f4
```
Lal

See merge request 8timerv2/8timerapiv200!303
```
  leialin committed Jul 04, 2020
  99bbb8f4 Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal · 6b53ad6b
  lal committed Jul 04, 2020
  
  6b53ad6b Browse Files
- 提交 · 6423ece8
  lal committed Jul 04, 2020
  
  6423ece8 Browse Files
- Merge branch 'lal' into 'develop' · 459d3431
```
Lal

See merge request 8timerv2/8timerapiv200!302
```
  leialin committed Jul 04, 2020
  459d3431 Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal · 945f5d36
  lal committed Jul 04, 2020
  
  945f5d36 Browse Files
- 提交 · 463e16a9
  lal committed Jul 04, 2020
  
  463e16a9 Browse Files
- Merge branch 'lal' into 'develop' · 3243bc72
```
Lal

See merge request 8timerv2/8timerapiv200!301
```
  leialin committed Jul 04, 2020
  3243bc72 Browse Files
- 提交 · b199597e
  lal committed Jul 04, 2020
  
  b199597e Browse Files
03 Jul, 2020 7 commits
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal · 5e57adcb
  lal committed Jul 03, 2020
  
  5e57adcb Browse Files
- 提交 · dbb240b9
  lal committed Jul 03, 2020
  
  dbb240b9 Browse Files
- Merge branch 'lal' into 'develop' · 14fb9a4b
```
Lal

See merge request 8timerv2/8timerapiv200!300
```
  leialin committed Jul 03, 2020
  14fb9a4b Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal · cb54d72e
  lal committed Jul 03, 2020
  
  cb54d72e Browse Files
- 提交 · 533d8efc
  lal committed Jul 03, 2020
  
  533d8efc Browse Files
- Merge branch 'lal' into 'develop' · 30d28cd5
```
提交

See merge request 8timerv2/8timerapiv200!299
```
  leialin committed Jul 03, 2020
  30d28cd5 Browse Files
- 提交 · f5374de7
  lal committed Jul 03, 2020
  
  f5374de7 Browse Files
02 Jul, 2020 16 commits
- Merge branch 'lal' into 'develop' · b200b71c
```
Lal

See merge request 8timerv2/8timerapiv200!298
```
  leialin committed Jul 02, 2020
  b200b71c Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal · bc2a10b6
  lal committed Jul 02, 2020
  
  bc2a10b6 Browse Files
- 提交 · f11e0b65
  lal committed Jul 02, 2020
  
  f11e0b65 Browse Files
- Merge branch 'lal' into 'develop' · 88e33fbb
```
Lal

See merge request 8timerv2/8timerapiv200!297
```
  leialin committed Jul 02, 2020
  88e33fbb Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal · f46d98e3
  lal committed Jul 02, 2020
  
  f46d98e3 Browse Files
- 提交 · 1069b4b5
  lal committed Jul 02, 2020
  
  1069b4b5 Browse Files
- Merge branch 'lal' into 'develop' · a546bffa
```
Lal

See merge request 8timerv2/8timerapiv200!296
```
  leialin committed Jul 02, 2020
  a546bffa Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal · f0990808
  lal committed Jul 02, 2020
  
  f0990808 Browse Files
- 提交 · 30ba2901
  lal committed Jul 02, 2020
  
  30ba2901 Browse Files
- Merge branch 'zyq_debug' into 'develop' · 2319f22c
```
Zyq debug

See merge request 8timerv2/8timerapiv200!295
```
  Administrator committed Jul 02, 2020
  2319f22c Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into zyq_debug · f0f5fd90
  yuquan.zhu committed Jul 02, 2020
  
  f0f5fd90 Browse Files
- 添加试用期自动计算 · 44e7189e
  yuquan.zhu committed Jul 02, 2020
  
  44e7189e Browse Files
- 试用期计算 · 5cc71a5c
  yuquan.zhu committed Jul 02, 2020
  
  5cc71a5c Browse Files
- Merge branch 'zyq_debug' into 'develop' · 9af55af9
```
Zyq debug

See merge request 8timerv2/8timerapiv200!294
```
  Administrator committed Jul 02, 2020
  9af55af9 Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into zyq_debug · e4a5bff0
  yuquan.zhu committed Jul 02, 2020
  
  e4a5bff0 Browse Files
- 修改一个小bug · 375a2726
  yuquan.zhu committed Jul 02, 2020
  
  375a2726 Browse Files
01 Jul, 2020 5 commits
- Merge branch 'lal' into 'develop' · f1a248df
```
Lal

See merge request 8timerv2/8timerapiv200!293
```
  leialin committed Jul 01, 2020
  f1a248df Browse Files
- 提交 · e74f3da5
  lal committed Jul 01, 2020
  
  e74f3da5 Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal · 909915b1
  lal committed Jul 01, 2020
  
  909915b1 Browse Files
- 提交 · f7bc0b4b
  lal committed Jul 01, 2020
  
  f7bc0b4b Browse Files
- Merge branch 'zyq_debug' into 'develop' · 69910b99
```
Zyq debug

See merge request 8timerv2/8timerapiv200!292
```
  Administrator committed Jul 01, 2020
  69910b99 Browse Files