Commits · cef9f92ad7aaf5498aa7b7ae31234f9f349e9c3b · 8timerv2 / 8timerapiv200 · GitLab

16 Jun, 2020 25 commits
- Merge branch 'lal' into 'develop' · cef9f92a
```
Lal

See merge request 8timerv2/8timerapiv200!205
```
  leialin committed Jun 16, 2020
  cef9f92a Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal · e2cb75e8
  lal committed Jun 16, 2020
  
  e2cb75e8 Browse Files
- 提交 · a947a4b1
  lal committed Jun 16, 2020
  
  a947a4b1 Browse Files
- Merge branch 'dsc' into 'develop' · 3ebd53d0
```
员工社保优化

See merge request 8timerv2/8timerapiv200!204
```
  dengshichuan committed Jun 16, 2020
  3ebd53d0 Browse Files
- 员工社保优化 · e4f8c802
  邓实川 committed Jun 16, 2020
  
  e4f8c802 Browse Files
- Merge branch 'tzq' into 'develop' · a0c75958
```
Tzq

See merge request 8timerv2/8timerapiv200!203
```
  dengshichuan committed Jun 16, 2020
  a0c75958 Browse Files
- +1 · 1976134d
  tangzhaoqian committed Jun 16, 2020
  
  1976134d Browse Files
- Merge branch 'develop' of http://develop-gitlab.youlingrc.com/8timerv2/8timerapiv200.git into tzq · a9014310
  tangzhaoqian committed Jun 16, 2020
  
  a9014310 Browse Files
- Merge branch 'dsc' into 'develop' · fa3e1090
```
电子合同优化，错误信息提示

See merge request 8timerv2/8timerapiv200!202
```
  dengshichuan committed Jun 16, 2020
  fa3e1090 Browse Files
- 绩效、审批、员工bug修复 · 9d0ea7d5
  tangzhaoqian committed Jun 16, 2020
  
  9d0ea7d5 Browse Files
- 电子合同优化，错误信息提示 · 44ba39ba
  邓实川 committed Jun 16, 2020
  
  44ba39ba Browse Files
- Merge branch 'lal' into 'develop' · d22afb94
```
Lal

See merge request 8timerv2/8timerapiv200!201
```
  leialin committed Jun 16, 2020
  d22afb94 Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal · 03a55279
  lal committed Jun 16, 2020
  
  03a55279 Browse Files
- 修复BUG · 9d4d6bfb
  lal committed Jun 16, 2020
  
  9d4d6bfb Browse Files
- Merge branch 'dsc' into 'develop' · 3c027a0f
```
Dsc

See merge request 8timerv2/8timerapiv200!200
```
  dengshichuan committed Jun 16, 2020
  3c027a0f Browse Files
- Merge branch 'develop' of http://develop-gitlab.youlingrc.com/8timerv2/8timerapiv200.git into dsc · 9038bf90
  邓实川 committed Jun 16, 2020
  
  9038bf90 Browse Files
- oss · 9fc00e15
  邓实川 committed Jun 16, 2020
  
  9fc00e15 Browse Files
- Merge branch 'lal' into 'develop' · 2e54e3d9
```
Lal

See merge request 8timerv2/8timerapiv200!199
```
  leialin committed Jun 16, 2020
  2e54e3d9 Browse Files
- Merge branch 'develop' of develop-gitlab.youlingrc.com:8timerv2/8timerapiv200 into lal · 98969fa1
  lal committed Jun 16, 2020
  
  98969fa1 Browse Files
- 提交BUG · 12819cca
  lal committed Jun 16, 2020
  
  12819cca Browse Files
- Merge branch 'dsc' into 'develop' · 1993178e
```
oss下载文件

See merge request 8timerv2/8timerapiv200!198
```
  dengshichuan committed Jun 16, 2020
  1993178e Browse Files
- oss下载文件 · ef6d3136
  邓实川 committed Jun 16, 2020
  
  ef6d3136 Browse Files
- Merge branch 'dsc' into 'develop' · f79ce8e4
```
Dsc

See merge request 8timerv2/8timerapiv200!197
```
  dengshichuan committed Jun 16, 2020
  f79ce8e4 Browse Files
- Merge branch 'develop' of http://develop-gitlab.youlingrc.com/8timerv2/8timerapiv200.git into dsc · 9602fd62
  邓实川 committed Jun 16, 2020
  
  9602fd62 Browse Files
- 电子合同优化 · 3117d5dd
  邓实川 committed Jun 16, 2020
  
  3117d5dd Browse Files
15 Jun, 2020 15 commits
- Merge branch 'tzq' into 'develop' · ecf909fa
```
+1

See merge request 8timerv2/8timerapiv200!196
```
  dengshichuan committed Jun 15, 2020
  ecf909fa Browse Files
- +1 · 9fe9b011
  tangzhaoqian committed Jun 15, 2020
  
  9fe9b011 Browse Files
- Merge branch 'tzq' into 'develop' · 78bd2bfb
```
绩效bug修复

See merge request 8timerv2/8timerapiv200!195
```
  dengshichuan committed Jun 15, 2020
  78bd2bfb Browse Files
- 绩效bug修复 · b24b2b32
  tangzhaoqian committed Jun 15, 2020
  
  b24b2b32 Browse Files
- Merge branch 'dsc' into 'develop' · cb7abb67
```
Dsc

See merge request 8timerv2/8timerapiv200!194
```
  dengshichuan committed Jun 15, 2020
  cb7abb67 Browse Files
- bug修复 · b64e1b1b
  邓实川 committed Jun 15, 2020
  
  b64e1b1b Browse Files
- Merge branch 'develop' of http://develop-gitlab.youlingrc.com/8timerv2/8timerapiv200.git into dsc · 4a430462
  邓实川 committed Jun 15, 2020
  
  4a430462 Browse Files
- Merge branch 'tzq' into 'develop' · 6fdcfe4b
```
绩效bug修复

See merge request 8timerv2/8timerapiv200!193
```
  dengshichuan committed Jun 15, 2020
  6fdcfe4b Browse Files
- 绩效bug修复 · 81ecf3de
  tangzhaoqian committed Jun 15, 2020
  
  81ecf3de Browse Files
- Merge branch 'develop' of http://develop-gitlab.youlingrc.com/8timerv2/8timerapiv200.git into dsc · aaa8c206
  邓实川 committed Jun 15, 2020
  
  aaa8c206 Browse Files
- Merge branch 'tzq' into 'develop' · 3288a002
```
Tzq

See merge request 8timerv2/8timerapiv200!192
```
  dengshichuan committed Jun 15, 2020
  3288a002 Browse Files
- +1 · 610c0a33
  tangzhaoqian committed Jun 15, 2020
  
  610c0a33 Browse Files
- Merge branch 'develop' of http://develop-gitlab.youlingrc.com/8timerv2/8timerapiv200.git into tzq · c48cfc0c
  tangzhaoqian committed Jun 15, 2020
  
  c48cfc0c Browse Files
- 绩效管理、员工管理bug修复 · fe0f4daa
  tangzhaoqian committed Jun 15, 2020
  
  fe0f4daa Browse Files
- Merge branch 'lal' into 'develop' · 6acd9e03
```
Lal

See merge request 8timerv2/8timerapiv200!191
```
  leialin committed Jun 15, 2020
  6acd9e03 Browse Files