Commits · 4acd4af002347cf470a613b7ee822ce695e2df86 · 8timerv2 / 8timerapiv200

17 Apr, 2020 3 commits
- Merge branch 'dsc' into 'develop' · 4acd4af0
```
Dsc

See merge request 8timerv2/8timerapiv200!27
```
  dengshichuan committed Apr 17, 2020
  4acd4af0 Browse Files
- 电子合同 · 4a71cc4a
  邓实川 committed Apr 17, 2020
  
  4a71cc4a Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc · 17164769
  邓实川 committed Apr 17, 2020
  
  17164769 Browse Files
16 Apr, 2020 2 commits
- Merge branch 'tzq' into 'develop' · b3f28de6
```
审批管理-流程节点解析

See merge request 8timerv2/8timerapiv200!26
```
  dengshichuan committed Apr 16, 2020
  b3f28de6 Browse Files
- 审批管理-流程节点解析 · 8187e597
  tangzhaoqian committed Apr 16, 2020
  
  8187e597 Browse Files
15 Apr, 2020 1 commit
- ignore测试包 · 013380e3
  邓实川 committed Apr 15, 2020
  
  013380e3 Browse Files
14 Apr, 2020 4 commits
- Merge branch 'dsc' into 'develop' · 11a48653
```
Dsc

See merge request 8timerv2/8timerapiv200!25
```
  dengshichuan committed Apr 14, 2020
  11a48653 Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc · e6db3b3c
  邓实川 committed Apr 14, 2020
  
  e6db3b3c Browse Files
- Merge branch 'lal' into 'develop' · 73e3c637
```
提交考勤

See merge request 8timerv2/8timerapiv200!24
```
  dengshichuan committed Apr 14, 2020
  73e3c637 Browse Files
- 组织架构部门领导参数添加 · 9bbabb7d
  邓实川 committed Apr 14, 2020
  
  9bbabb7d Browse Files
13 Apr, 2020 1 commit
- 提交考勤 · 7e8ed885
  ilal committed Apr 13, 2020
  
  7e8ed885 Browse Files
11 Apr, 2020 2 commits
- Merge branch 'dsc' into 'develop' · edd5a22c
```
短信模板枚举类，阿里云短信常量优化

See merge request 8timerv2/8timerapiv200!23
```
  dengshichuan committed Apr 11, 2020
  edd5a22c Browse Files
- 短信模板枚举类，阿里云短信常量优化 · a3e64ae2
  邓实川 committed Apr 11, 2020
  
  a3e64ae2 Browse Files
08 Apr, 2020 8 commits
- Merge branch 'dsc' into 'develop' · 65cd1bec
```
密码修改，短信验证优化

See merge request 8timerv2/8timerapiv200!22
```
  dengshichuan committed Apr 08, 2020
  65cd1bec Browse Files
- 密码修改，短信验证优化 · 16d02c4b
  邓实川 committed Apr 08, 2020
  
  16d02c4b Browse Files
- Merge branch 'lal' into 'develop' · e5870761
```
修改

See merge request 8timerv2/8timerapiv200!21
```
  dengshichuan committed Apr 08, 2020
  e5870761 Browse Files
- 修改 · e6f8138b
  Yl123 committed Apr 08, 2020
  
  e6f8138b Browse Files
- Merge branch 'wdz' into 'develop' · d1347eb5
```
Wdz

See merge request 8timerv2/8timerapiv200!20
```
  dengshichuan committed Apr 08, 2020
  d1347eb5 Browse Files
- Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz · 25c41592
  东州翁 committed Apr 08, 2020
  
  25c41592 Browse Files
- Merge branch 'lal' into 'develop' · 65aafb27
```
Lal

See merge request 8timerv2/8timerapiv200!18
```
  dengshichuan committed Apr 08, 2020
  65aafb27 Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into lal · d8cc9bf2
  Yl123 committed Apr 08, 2020
  
  d8cc9bf2 Browse Files
07 Apr, 2020 14 commits
- 提交 · d481adbe
  Yl123 committed Apr 07, 2020
  
  d481adbe Browse Files
- debug了登录修改密码接口 · dffbf202
  东州翁 committed Apr 07, 2020
  
  dffbf202 Browse Files
- 提交 · d4b01113
  Yl123 committed Apr 07, 2020
  
  d4b01113 Browse Files
- 企业中心在修改密码接口添加了修改原密码的方法，更正验证码code的类型 · cfcb69a0
  东州翁 committed Apr 07, 2020
  
  cfcb69a0 Browse Files
- Merge branch 'wdz' into 'develop' · cfa774c5
```
删除冲突

See merge request 8timerv2/8timerapiv200!17
```
  dengshichuan committed Apr 07, 2020
  cfa774c5 Browse Files
- Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz · b2776257
  东州翁 committed Apr 07, 2020
  
  b2776257 Browse Files
- 字样修改，sql换行修改 · 421c971a
  东州翁 committed Apr 07, 2020
  
  421c971a Browse Files
- 删除冲突 · 90d10d4a
  东州翁 committed Apr 07, 2020
  
  90d10d4a Browse Files
- Merge branch 'wdz' into 'develop' · e5b4f77b
```
Wdz

See merge request 8timerv2/8timerapiv200!16
```
  dengshichuan committed Apr 07, 2020
  e5b4f77b Browse Files
- 2020.4.7，更改了人事仪表盘接口显示的数据格式 · 2dbbc6ac
  东州翁 committed Apr 07, 2020
  
  2dbbc6ac Browse Files
- 测试cs · 67c426df
  Yl123 committed Apr 07, 2020
  
  67c426df Browse Files
- 测试csc · 6b286f64
  Yl123 committed Apr 07, 2020
  
  6b286f64 Browse Files
- 测试2 · 3768fa7b
  Yl123 committed Apr 07, 2020
  
  3768fa7b Browse Files
- 测试 · 4adf39a6
  Yl123 committed Apr 07, 2020
  
  4adf39a6 Browse Files
03 Apr, 2020 5 commits
- 优化了添加员工接口，现在可以正常添加岗位，重写了人事仪表盘 · c1f6e5ee
  东州翁 committed Apr 03, 2020
  
  c1f6e5ee Browse Files
- Merge branch 'wdz' into 'develop' · 05ae6411
```
Wdz

See merge request 8timerv2/8timerapiv200!15
```
  dengshichuan committed Apr 03, 2020
  05ae6411 Browse Files
- Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz · 8315a4c6
```
# Conflicts:
#	src/main/java/cn/timer/api/controller/yggl/YgglController.java
```
  东州翁 committed Apr 03, 2020
  8315a4c6 Browse Files
- 改良人事仪表盘60% · a28cc7ad
  东州翁 committed Apr 03, 2020
  
  a28cc7ad Browse Files
- Merge branch 'dsc' into 'develop' · bea51ce9
```
员工管理bug修改3

See merge request 8timerv2/8timerapiv200!14
```
  dengshichuan committed Apr 03, 2020
  bea51ce9 Browse Files