Commits · master · 姜雷 / cdsf-static-bg

13 Nov, 2018 3 commits
- Merge branch 'test' into 'master' · 223374ac
  姜雷 authored Nov 13, 2018
```
Test

See merge request !18
```
  223374ac
- Merge branch 'develop' into 'test' · aa9402c7
  姜雷 authored Nov 13, 2018
```
微信授权添加科室电话筛选，切换后重置筛选条件

See merge request !17
```
  aa9402c7
- 微信授权添加科室电话筛选，切换后重置筛选条件 · 32d87acd
  姜雷 authored Nov 13, 2018
  
  32d87acd
12 Nov, 2018 3 commits
- Merge branch 'test' into 'master' · 6938ce2c
  姜雷 authored Nov 12, 2018
```
Test

See merge request !16
```
  6938ce2c
- Merge branch 'develop' into 'test' · cbdc28fc
  姜雷 authored Nov 12, 2018
```
添加筛选功能

See merge request !15
```
  cbdc28fc
- 添加筛选功能 · bbe429e1
  姜雷 authored Nov 12, 2018
  
  bbe429e1
08 Nov, 2018 1 commit
- Merge branch 'test' into 'master' · 49b43353
  姜雷 authored Nov 08, 2018
```
Test

See merge request !14
```
  49b43353
02 Nov, 2018 3 commits
- Merge branch 'develop' into 'test' · 3f79ff83
  姜雷 authored Nov 02, 2018
```
修改打印样式

See merge request !13
```
  3f79ff83
- 修改打印样式 · 124d9898
  姜雷 authored Nov 02, 2018
  
  124d9898
- Merge branch 'develop' into 'test' · 258ad078
  姜雷 authored Nov 02, 2018
```
Develop

See merge request !12
```
  258ad078
01 Nov, 2018 5 commits
- 处理重复name问题 · 23faf18a
  姜雷 authored Oct 31, 2018
  
  23faf18a
- 修改派车车辆可以为多选 · 6eed4852
  姜雷 authored Oct 31, 2018
  
  6eed4852
- 修改版权符号 · 0ab12f2d
  姜雷 authored Oct 31, 2018
  
  0ab12f2d
- 添加导出 · 7b4f8b79
  姜雷 authored Oct 31, 2018
  
  7b4f8b79
- 修改登录提示框颜色 · 10b1d039
  姜雷 authored Oct 31, 2018
  
  10b1d039
30 Oct, 2018 3 commits
- Merge branch 'test' into 'master' · 4120b771
  姜雷 authored Oct 30, 2018
```
Test

See merge request !11
```
  4120b771
- Merge branch 'develop' into 'test' · c3abe53e
  姜雷 authored Oct 30, 2018
```
计算天数向下取整大于1小时多计算一天

See merge request !10
```
  c3abe53e
- 计算天数向下取整大于1小时多计算一天 · cfbd11de
  姜雷 authored Oct 30, 2018
  
  cfbd11de
26 Oct, 2018 3 commits
- Merge branch 'test' into 'master' · e01945e9
  姜雷 authored Oct 26, 2018
```
Test

See merge request !9
```
  e01945e9
- Merge branch 'develop' into 'test' · dfe6e702
  姜雷 authored Oct 26, 2018
```
替换素材

See merge request !8
```
  dfe6e702
- 替换素材 · a06fde71
  姜雷 authored Oct 26, 2018
  
  a06fde71
19 Oct, 2018 2 commits
- Merge branch 'develop' into test · e931672f
  姜雷 authored Oct 19, 2018
  
  e931672f
- 修改计算时间 · 0740b84b
  姜雷 authored Oct 19, 2018
  
  0740b84b
18 Oct, 2018 3 commits
- Merge branch 'test' of http://git.168cad.top/jianglei/cdsf-static-bg into test · b667dc3b
  姜雷 authored Oct 18, 2018
  
  b667dc3b
- Merge branch 'develop' into test · a2b3dc6d
  姜雷 authored Oct 18, 2018
  
  a2b3dc6d
- 修改打印样式以及用车时间 · d0af4d3b
  姜雷 authored Oct 18, 2018
  
  d0af4d3b
17 Oct, 2018 3 commits
- Merge branch 'develop' into 'test' · 5f3f9614
  姜雷 authored Oct 17, 2018
```
Develop

See merge request !7
```
  5f3f9614
- 调整打印样式 · d2142dda
  姜雷 authored Oct 17, 2018
  
  d2142dda
- 修改登录页面样式 · 744bcd9a
  姜雷 authored Oct 17, 2018
  
  744bcd9a
15 Oct, 2018 8 commits
- Merge branch 'develop' into 'test' · a81e8b4a
  姜雷 authored Oct 15, 2018
```
Develop

See merge request !6
```
  a81e8b4a
- 处理token过期登出 · 4ce66a95
  姜雷 authored Oct 15, 2018
  
  4ce66a95
- 修改登陆和首页 · a42f6dea
  姜雷 authored Oct 15, 2018
  
  a42f6dea
- Merge branch 'develop' into test · 105abc71
  姜雷 authored Oct 15, 2018
  
  105abc71
- 修改用车管理搜索提示文字 · 03514e56
  姜雷 authored Oct 15, 2018
  
  03514e56
- 调整打印页样式 · 6410fd07
  姜雷 authored Oct 15, 2018
  
  6410fd07
- 修改用车详情对齐方式#1401 · a55c4e65
  姜雷 authored Oct 15, 2018
  
  a55c4e65
- 添加排序 · 456bf9e9
  姜雷 authored Oct 15, 2018
  
  456bf9e9
12 Oct, 2018 3 commits
- Merge branch 'develop' into 'test' · 665155a3
  向童 authored Oct 12, 2018
```
老师

See merge request !5
```
  665155a3
- 老师 · 8536366b
  向童 authored Oct 12, 2018
  
  8536366b
- Merge branch 'develop' into 'test' · 94b9f2cf
  向童 authored Oct 12, 2018
```
时间处理

See merge request !4
```
  94b9f2cf