Commits · de9778593a27e92dd35f3c249be524206c237c30 · 8timerv2 / 8timerapiv200 · GitLab

08 May, 2020 1 commit
- 登录人信息API 优化，企业中心-显示常用的企业开票资料API 优化 · de977859
  tangzhaoqian committed May 08, 2020
  
  de977859 Browse Files
07 May, 2020 8 commits
- Merge branch 'tzq' into 'develop' · 4d80a30b
```
Tzq

See merge request 8timerv2/8timerapiv200!74
```
  Administrator committed May 07, 2020
  4d80a30b Browse Files
- 审批权限优化，8个模板数据调用封装 · ec60e32e
  tangzhaoqian committed May 07, 2020
  
  ec60e32e Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into tzq · fac37bc7
  tangzhaoqian committed May 07, 2020
  
  fac37bc7 Browse Files
- Merge branch 'lal' into 'develop' · b3ee7dc0
```
修改字段

See merge request 8timerv2/8timerapiv200!73
```
  Administrator committed May 07, 2020
  b3ee7dc0 Browse Files
- 修改字段 · cf590ea9
  ilal committed May 07, 2020
  
  cf590ea9 Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into tzq · c4ba7964
  tangzhaoqian committed May 07, 2020
  
  c4ba7964 Browse Files
- 权限、8个模板数据接口定义 · 856d2893
  tangzhaoqian committed May 07, 2020
  
  856d2893 Browse Files
- Merge branch 'wdz' into 'develop' · 8f15eb9c
```
添加方法根据传来的empNum获取该人员的岗位，以及上面所有的部门id，返回integer数组

See merge request 8timerv2/8timerapiv200!72
```
  Administrator committed May 07, 2020
  8f15eb9c Browse Files
06 May, 2020 5 commits
- Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz · 3c0ab6b6
```
# Conflicts:
#	src/main/java/cn/timer/api/controller/yggl/YgglController.java
```
  东州翁 committed May 06, 2020
  3c0ab6b6 Browse Files
- 添加方法根据传来的empNum获取该人员的岗位，以及上面所有的部门id，返回integer数组，更正发票资料表的对应表名，工作性质从0开始 · 9c343d1a
  东州翁 committed May 06, 2020
  
  9c343d1a Browse Files
- Merge branch 'lal' into 'develop' · 5093bf8e
```
Lal

See merge request 8timerv2/8timerapiv200!71
```
  Administrator committed May 06, 2020
  5093bf8e Browse Files
- 提交测试接口 · bc1b2847
  ilal committed May 06, 2020
  
  bc1b2847 Browse Files
- 修复BUG · 47fdeac9
  ilal committed May 06, 2020
  
  47fdeac9 Browse Files
05 May, 2020 6 commits
- Merge branch 'dsc' into 'develop' · 2c302b13
```
Dsc

See merge request 8timerv2/8timerapiv200!70
```
  dengshichuan committed May 05, 2020
  2c302b13 Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc · 160cc6fe
  邓实川 committed May 05, 2020
  
  160cc6fe Browse Files
- Merge branch 'tzq' into 'develop' · a0899e13
```
Tzq

See merge request 8timerv2/8timerapiv200!69
```
  dengshichuan committed May 05, 2020
  a0899e13 Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc · 68220c3e
  邓实川 committed May 05, 2020
  
  68220c3e Browse Files
- 参数bug修复 · bf2a48bd
  邓实川 committed May 05, 2020
  
  bf2a48bd Browse Files
- 接口优化 · 75b48506
  邓实川 committed May 05, 2020
  
  75b48506 Browse Files
30 Apr, 2020 11 commits
- 提交+1 · 739ba98d
  tangzhaoqian committed Apr 30, 2020
  
  739ba98d Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into tzq · d0b25cc8
  tangzhaoqian committed Apr 30, 2020
  
  d0b25cc8 Browse Files
- 审批撤回，审批详情头像，validation参数校验+AOP切面统一处理校验报错返回 · 09c63150
  tangzhaoqian committed Apr 30, 2020
  
  09c63150 Browse Files
- 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 9 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