Commits · 7352dec925da05eb246e013e4523a36414805fbb · 8timerv2 / 8timerapiv200 · GitLab

28 Mar, 2020 1 commit
- Merge branch 'wdz' into 'develop' · 7352dec9
```
Wdz

See merge request 8timerv2/8timerapiv200!8
```
  Administrator committed Mar 28, 2020
  7352dec9 Browse Files
27 Mar, 2020 9 commits
- 更新籍贯城市的显示方式，补上两个社保公积金的删除，修改接口 · b72577be
  东州翁 committed Mar 27, 2020
  
  b72577be Browse Files
- Merge branch 'develop' into wdz · a709a4de
  东州翁 committed Mar 27, 2020
  
  a709a4de Browse Files
- no message · 248ea23e
  东州翁 committed Mar 27, 2020
  
  248ea23e Browse Files
- 暂存文件 · 7928edfa
  东州翁 committed Mar 27, 2020
  
  7928edfa Browse Files
- 检查一遍代码，修复一个离职3-4的参数名，代码不变，删除空行。 · 075ce249
  太阳与水 committed Mar 27, 2020
  
  075ce249 Browse Files
- Revert "no message" · eefbad4d
```
This reverts commit 5305db72.
```
  东州翁 committed Mar 27, 2020
  eefbad4d Browse Files
- no message · 5305db72
  东州翁 committed Mar 27, 2020
  
  5305db72 Browse Files
- Merge branch 'develop' of 120.24.24.239:8timerv2/8timerapiv200 into wdz · 93c9b50b
  东州翁 committed Mar 27, 2020
  
  93c9b50b Browse Files
- 检查一遍代码，修复一个离职3-4的参数名，代码不变，删除空行。 · 171f0178
  太阳与水 committed Mar 27, 2020
  
  171f0178 Browse Files
26 Mar, 2020 18 commits
- Merge branch 'dsc' into 'develop' · ad41a9a4
```
Dsc

See merge request 8timerv2/8timerapiv200!7
```
  Administrator committed Mar 26, 2020
  ad41a9a4 Browse Files
- Merge branch 'develop' of · 8b048405
```
http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc

Conflicts:
	src/main/java/cn/timer/api/controller/yggl/YgglController.java
```
  邓实川 committed Mar 26, 2020
  8b048405 Browse Files
- Merge branch 'wdz' into 'develop' · ce64f163
```
Wdz

See merge request 8timerv2/8timerapiv200!6
```
  Administrator committed Mar 26, 2020
  ce64f163 Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc · ce90486a
  邓实川 committed Mar 26, 2020
  
  ce90486a Browse Files
- 员工管理,企业讯息bug优化 · 17c62423
  邓实川 committed Mar 26, 2020
  
  17c62423 Browse Files
- 排序100% · a765c54f
  太阳与水 committed Mar 26, 2020
  
  a765c54f Browse Files
- 更改员工搜索为实川的员工搜索接口 · 05fd3c8c
  太阳与水 committed Mar 26, 2020
  
  05fd3c8c Browse Files
- 排序50% · 5241accb
  太阳与水 committed Mar 26, 2020
  
  5241accb Browse Files
- Merge branch 'develop' of · b3964b6e
```
http://120.24.24.239:8082/8timerv2/8timerapiv200.git into wdz

Conflicts:
	src/main/resources/application-pro.yml
```
  太阳与水 committed Mar 26, 2020
  b3964b6e Browse Files
- commit · b3e95d89
  太阳与水 committed Mar 26, 2020
  
  b3e95d89 Browse Files
- 配置 · 158aae23
  太阳与水 committed Mar 26, 2020
  
  158aae23 Browse Files
- 更改了籍贯null · 135918b9
  太阳与水 committed Mar 26, 2020
  
  135918b9 Browse Files
- Merge branch 'dsc' into 'develop' · 696c6577
```
Dsc

See merge request 8timerv2/8timerapiv200!5
```
  Administrator committed Mar 26, 2020
  696c6577 Browse Files
- application数据库地址配置更新,企业讯息bug优化 · 974e20b2
  邓实川 committed Mar 26, 2020
  
  974e20b2 Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc · 7c68173f
  邓实川 committed Mar 26, 2020
  
  7c68173f Browse Files
- 企业讯息bug优化,项目配置文件jpa自动生成表 · 64fd58f5
  邓实川 committed Mar 26, 2020
  
  64fd58f5 Browse Files
- Merge branch 'wdz' into 'develop' · 3802c5bb
```
Wdz

See merge request 8timerv2/8timerapiv200!4
```
  Administrator committed Mar 26, 2020
  3802c5bb Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into wdz · 0cbf4266
  太阳与水 committed Mar 26, 2020
  
  0cbf4266 Browse Files
25 Mar, 2020 11 commits
- 完善籍贯 · 80f2be34
  太阳与水 committed Mar 25, 2020
  
  80f2be34 Browse Files
- Merge branch 'develop' of · ea5e0ba3
```
http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc

Conflicts:
	src/main/java/cn/timer/api/controller/yggl/YgglController.java
```
  邓实川 committed Mar 25, 2020
  ea5e0ba3 Browse Files
- 员工列表优化,电子合同创建个人账户身份类型更新 · 606ee3ea
  邓实川 committed Mar 25, 2020
  
  606ee3ea Browse Files
- 重新从服务器拉代码,再重新上传新代码 · 00232db0
  太阳与水 committed Mar 25, 2020
  
  00232db0 Browse Files
- Merge branch 'wdz' into 'develop' · 4b1f9eaf
```
Wdz

See merge request 8timerv2/8timerapiv200!3
```
  Administrator committed Mar 25, 2020
  4b1f9eaf Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into wdz · 965434d0
  太阳与水 committed Mar 25, 2020
  
  965434d0 Browse Files
- Merge branch 'dsc' into 'develop' · 9b5129e6
```
Dsc

See merge request 8timerv2/8timerapiv200!2
```
  Administrator committed Mar 25, 2020
  9b5129e6 Browse Files
- Merge branch 'develop' of http://120.24.24.239:8082/8timerv2/8timerapiv200.git into dsc · 708be3ce
  邓实川 committed Mar 25, 2020
  
  708be3ce Browse Files
- application · e1a7b739
  邓实川 committed Mar 25, 2020
  
  e1a7b739 Browse Files
- Merge branch 'zyq' into 'develop' · 492cc399
```
Zyq

See merge request 8timerv2/8timerapiv200!1
```
  Administrator committed Mar 25, 2020
  492cc399 Browse Files
- 跨域 · 8f375736
  yuquan.zhu committed Mar 25, 2020
  
  8f375736 Browse Files
24 Mar, 2020 1 commit
- 修改跨域访问 · 89999286
  yuquan.zhu committed Mar 25, 2020
  
  89999286 Browse Files