Commits · b3964b6e5f2d4ca40a9aacd894c162a45db8b813 · 8timerv2 / 8timerapiv200 · GitLab

26 Mar, 2020 10 commits
- 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 2 commits
- 修改跨域访问 · 89999286
  yuquan.zhu committed Mar 25, 2020
  
  89999286 Browse Files
- 强迫症解决了所有的waring，现在看着舒服多了；发现导入导出部分流未关闭占用系统资源，使用流记得一定要close，，一定要close，一定要close。 · dde86583
  邓实川 committed Mar 24, 2020
  
  dde86583 Browse Files
20 Mar, 2020 3 commits
- 更新员工管理的导入，新增籍贯和城市接口，还有根据部门岗位id显示岗位名称 · a09f5e6f
  太阳与水 committed Mar 20, 2020
  
  a09f5e6f Browse Files
- 测试删除Test包文件 · 45d8d006
  邓实川 committed Mar 20, 2020
  
  45d8d006 Browse Files
- ignore文件测试 · 742f4676
  邓实川 committed Mar 20, 2020
  
  742f4676 Browse Files
19 Mar, 2020 2 commits
- application-pro 数据库配置 · e617f74c
  邓实川 committed Mar 19, 2020
  
  e617f74c Browse Files
- transfer · db73852e
  yuquan.zhu committed Mar 19, 2020
  
  db73852e Browse Files