Commits · d1347eb56806252dd4e168eb404319f35d15e5d4 · 8timerv2 / 8timerapiv200 · GitLab

08 Apr, 2020 4 commits
- 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 11 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
- 员工管理bug修改3 · 719177b4
  邓实川 committed Apr 03, 2020
  
  719177b4 Browse Files
- Merge branch 'dsc' into 'develop' · 875face2
```
员工bug,配置输出信息info

See merge request 8timerv2/8timerapiv200!13
```
  dengshichuan committed Apr 03, 2020
  875face2 Browse Files
- 员工bug,配置输出信息info · 286f7f0a
  邓实川 committed Apr 03, 2020
  
  286f7f0a Browse Files
- Merge branch 'dsc' into 'develop' · 4570c2a3
```
Dsc

See merge request 8timerv2/8timerapiv200!12
```
  dengshichuan committed Apr 03, 2020
  4570c2a3 Browse Files
- 员工个人信息,提醒时间改为8点 · 1e967efd
  邓实川 committed Apr 03, 2020
  
  1e967efd Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc · 0723b552
  邓实川 committed Apr 03, 2020
  
  0723b552 Browse Files
01 Apr, 2020 2 commits
- Merge branch 'zyq' into 'develop' · def478a7
```
修改 build name

See merge request 8timerv2/8timerapiv200!11
```
  Administrator committed Apr 01, 2020
  def478a7 Browse Files
- 修改 build name · 61a04918
  yuquan.zhu committed Apr 01, 2020
  
  61a04918 Browse Files
31 Mar, 2020 1 commit
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc · 4d342b14
  邓实川 committed Mar 31, 2020
  
  4d342b14 Browse Files
30 Mar, 2020 3 commits
- Merge branch 'wdz' into 'develop' · 8518de97
```
Wdz

See merge request 8timerv2/8timerapiv200!10
```
  Administrator committed Mar 30, 2020
  8518de97 Browse Files
- Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz · 56cd4222
  东州翁 committed Mar 30, 2020
  
  56cd4222 Browse Files
- 2020.3.28号代码 · 1650cc69
  东州翁 committed Mar 30, 2020
  
  1650cc69 Browse Files
28 Mar, 2020 5 commits
- 什么都没改 · 6f223a7b
  邓实川 committed Mar 28, 2020
  
  6f223a7b Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc · b32f48cd
  邓实川 committed Mar 28, 2020
  
  b32f48cd Browse Files
- Merge branch 'tzq' into 'develop' · 055fc866
```
swagger1.UI优化 2.模块排 3.接口排序

See merge request 8timerv2/8timerapiv200!9
```
  Administrator committed Mar 28, 2020
  055fc866 Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into tzq · 7f169b13
  tangzhaoqian committed Mar 28, 2020
  
  7f169b13 Browse Files
- Merge branch 'wdz' into 'develop' · 7352dec9
```
Wdz

See merge request 8timerv2/8timerapiv200!8
```
  Administrator committed Mar 28, 2020
  7352dec9 Browse Files