Commits · cfd79ae6dcaeaf04cd82a4e009dbabfe639bd685 · 8timerv2 / 8timerapiv200 · GitLab

30 Apr, 2020 8 commits
- Merge branch 'dsc' into 'develop' · cfd79ae6
```
Dsc

See merge request 8timerv2/8timerapiv200!68
```
  dengshichuan committed Apr 30, 2020
  cfd79ae6 Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc · acc324c5
  邓实川 committed Apr 30, 2020
  
  acc324c5 Browse Files
- Merge branch 'wdz' into 'develop' · 97782601
```
Wdz

See merge request 8timerv2/8timerapiv200!67
```
  dengshichuan committed Apr 30, 2020
  97782601 Browse Files
- Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz · 605be779
  东州翁 committed Apr 30, 2020
  
  605be779 Browse Files
- 修改企业信息表area字段类型 · ccfbf74a
  东州翁 committed Apr 30, 2020
  
  ccfbf74a Browse Files
- 细节判断优化 · 5cd87e96
  邓实川 committed Apr 30, 2020
  
  5cd87e96 Browse Files
- Merge branch 'wdz' into 'develop' · 15ecb5f8
```
新增展示所有籍贯接口，删除根据籍贯id显示籍贯名接口

See merge request 8timerv2/8timerapiv200!66
```
  Administrator committed Apr 30, 2020
  15ecb5f8 Browse Files
- 新增展示所有籍贯接口，删除根据籍贯id显示籍贯名接口 · cc2988f4
  东州翁 committed Apr 30, 2020
  
  cc2988f4 Browse Files
29 Apr, 2020 20 commits
- Merge branch 'tzq' into 'develop' · 03794abb
```
审批人审批- 转派功能

See merge request 8timerv2/8timerapiv200!65
```
  Administrator committed Apr 29, 2020
  03794abb Browse Files
- 审批人审批- 转派功能 · 8434079e
  tangzhaoqian committed Apr 29, 2020
  
  8434079e Browse Files
- Merge branch 'wdz' into 'develop' · d4aba8c9
```
Wdz

See merge request 8timerv2/8timerapiv200!64
```
  dengshichuan committed Apr 29, 2020
  d4aba8c9 Browse Files
- Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz · c39dd6be
```
# Conflicts:
#	src/main/java/cn/timer/api/controller/LoginController.java
```
  东州翁 committed Apr 29, 2020
  c39dd6be Browse Files
- 应前端需求添加查询上级主管接口的头像字段 · 121cde05
  东州翁 committed Apr 29, 2020
  
  121cde05 Browse Files
- Merge branch 'dsc' into 'develop' · 79334da6
```
Dsc

See merge request 8timerv2/8timerapiv200!63
```
  dengshichuan committed Apr 29, 2020
  79334da6 Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc · 80c6c0fc
  邓实川 committed Apr 29, 2020
  
  80c6c0fc Browse Files
- 登录bug修改 · 484537a5
  邓实川 committed Apr 29, 2020
  
  484537a5 Browse Files
- Merge branch 'tzq' into 'develop' · 1b81adf0
```
审批Router解析

See merge request 8timerv2/8timerapiv200!62
```
  dengshichuan committed Apr 29, 2020
  1b81adf0 Browse Files
- 审批Router解析 · 63067699
  tangzhaoqian committed Apr 29, 2020
  
  63067699 Browse Files
- Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz · 67d37869
```
# Conflicts:
#	src/main/java/cn/timer/api/controller/LoginController.java
```
  东州翁 committed Apr 29, 2020
  67d37869 Browse Files
- Merge branch 'tzq' into 'develop' · e682011e
```
Tzq

See merge request 8timerv2/8timerapiv200!61
```
  dengshichuan committed Apr 29, 2020
  e682011e Browse Files
- 登录bug · cdf82c88
  tangzhaoqian committed Apr 29, 2020
  
  cdf82c88 Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into tzq · 2c3de20f
  tangzhaoqian committed Apr 29, 2020
  
  2c3de20f Browse Files
- 审批代码整理 · dbf92aee
  tangzhaoqian committed Apr 29, 2020
  
  dbf92aee Browse Files
- Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz · 80c3516d
  东州翁 committed Apr 29, 2020
  
  80c3516d Browse Files
- 新增企业一个字段endtime · e1254cc7
  东州翁 committed Apr 29, 2020
  
  e1254cc7 Browse Files
- Merge branch 'dsc' into 'develop' · 0a58c443
```
Dsc

See merge request 8timerv2/8timerapiv200!60
```
  dengshichuan committed Apr 29, 2020
  0a58c443 Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc · b22105bf
  邓实川 committed Apr 29, 2020
  
  b22105bf Browse Files
- 登录注册、企业中心bug修复 · 63159098
  邓实川 committed Apr 29, 2020
  
  63159098 Browse Files
28 Apr, 2020 12 commits
- Merge branch 'wdz' into 'develop' · fce27486
```
更改查询员工列表接口，添加了头像url一列，已拉取develop

See merge request 8timerv2/8timerapiv200!59
```
  Administrator committed Apr 28, 2020
  fce27486 Browse Files
- Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz · add1bf79
  东州翁 committed Apr 28, 2020
  
  add1bf79 Browse Files
- 更改查询员工列表接口，添加了头像url一列 · 89130970
  东州翁 committed Apr 28, 2020
  
  89130970 Browse Files
- Merge branch 'wdz' into 'develop' · c64e6829
```
debug获取用户头像接口

See merge request 8timerv2/8timerapiv200!58
```
  Administrator committed Apr 28, 2020
  c64e6829 Browse Files
- debug获取用户头像接口 · b3156281
  东州翁 committed Apr 28, 2020
  
  b3156281 Browse Files
- Merge branch 'dsc' into 'develop' · 5e7c7616
```
短信优化，bug修复

See merge request 8timerv2/8timerapiv200!57
```
  dengshichuan committed Apr 28, 2020
  5e7c7616 Browse Files
- 短信优化，bug修复 · d48db2ed
  邓实川 committed Apr 28, 2020
  
  d48db2ed Browse Files
- Merge branch 'wdz' into 'develop' · 4ce10e56
```
Wdz

See merge request 8timerv2/8timerapiv200!56
```
  Administrator committed Apr 28, 2020
  4ce10e56 Browse Files
- Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz · 72b41163
  东州翁 committed Apr 28, 2020
  
  72b41163 Browse Files
- 新增获取用户头像 · 82e2df48
  东州翁 committed Apr 28, 2020
  
  82e2df48 Browse Files
- Merge branch 'dsc' into 'develop' · e22b2a90
```
Dsc

See merge request 8timerv2/8timerapiv200!55
```
  dengshichuan committed Apr 28, 2020
  e22b2a90 Browse Files
- 优化 · 9ac40a0f
  邓实川 committed Apr 28, 2020
  
  9ac40a0f Browse Files