Commits · 8c4dd12e5addf1f82a9717aa5844f961cc1a4414 · zhangyusheng / YX_IDENT_beijing_auxiliary_YD

29 Apr, 2019 9 commits
- 分拣转出任务单时，没选中任务单给提示 · 8c4dd12e
  liboyang authored Apr 29, 2019
  
  8c4dd12e
- Merge remote-tracking branch 'origin/dev' into dev · 427e18fb
  dahai authored Apr 29, 2019
  
  427e18fb
- push · b06ab6e5
  dahai authored Apr 29, 2019
  
  b06ab6e5
- 膜耗材和卡体耗材报表 · be2c4b0c
  liboyang authored Apr 29, 2019
  
  be2c4b0c
- push · b1f92810
  dahai authored Apr 29, 2019
  
  b1f92810
- push · 4b352260
  dahai authored Apr 29, 2019
  
  4b352260
- push · ffa69f1c
  dahai authored Apr 29, 2019
  
  ffa69f1c
- 添加查询操作人信息 · e0a89967
  dahai authored Apr 29, 2019
  
  e0a89967
- 添加卡机统计报表、膜统计报表 · e8631987
  dahai authored Apr 29, 2019
```
修改耗材统计流程
添加耗材审核工位
```
  e8631987
28 Apr, 2019 21 commits
- Merge remote-tracking branch 'origin/dev' into dev · 083f6f22
  dahai authored Apr 28, 2019
  
  083f6f22
- push · c94b3305
  dahai authored Apr 28, 2019
  
  c94b3305
- 解决项目启动问题 · 78072fd6
  liboyang authored Apr 28, 2019
  
  78072fd6
- 修改添加卡体、膜数据时备注为空的情况 · b5c54470
  dahai authored Apr 28, 2019
  
  b5c54470
- Merge remote-tracking branch 'origin/dev' into dev · 7e5bf6e6
  dahai authored Apr 28, 2019
  
  7e5bf6e6
- push · 73b42435
  dahai authored Apr 28, 2019
  
  73b42435
- Merge remote-tracking branch 'origin/dev' into dev · 7fe3f10a
  liuxinben authored Apr 28, 2019
  
  7fe3f10a
- Merge branch 'dev' of… · 57b73991
  liuxinben authored Apr 28, 2019
```
Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev

# Conflicts:
#	src/main/resources/application.yml
```
  57b73991
- Merge remote-tracking branch 'origin/dev' into dev · 65e03dbd
  dahai authored Apr 28, 2019
  
  65e03dbd
- 添加审核耗材管理API · 14170667
  dahai authored Apr 28, 2019
```
修改添加耗材管理状态
```
  14170667
- 膜耗材管理 · 1371f82b
  liboyang authored Apr 28, 2019
  
  1371f82b
- Merge remote-tracking branch 'origin/dev' into dev · 04db94e3
  dahai authored Apr 28, 2019
  
  04db94e3
- 修改保存数据核验报表详情 · edb9a18c
  dahai authored Apr 28, 2019
  
  edb9a18c
- 退出bug解决 · 5b6ad07d
  liboyang authored Apr 28, 2019
  
  5b6ad07d
- 任务单前台页面不需要排序 · 8d29a75b
  liboyang authored Apr 28, 2019
  
  8d29a75b
- Merge remote-tracking branch 'origin/dev' into dev · 5ea00bb4
  liboyang authored Apr 28, 2019
  
  5ea00bb4
- EMS添加备注 · d2e639e4
  liboyang authored Apr 28, 2019
  
  d2e639e4
- 修改查询生成交接单数据 · 73b15bff
  dahai authored Apr 28, 2019
  
  73b15bff
- 修改bug · fbfe36b9
  liboyang authored Apr 28, 2019
  
  fbfe36b9
- push · 91558bb0
  liuxinben authored Apr 28, 2019
  
  91558bb0
- 刷证显示详单 · bdac2671
  liboyang authored Apr 28, 2019
  
  bdac2671
26 Apr, 2019 10 commits
- push · b7cf18c4
  dahai authored Apr 26, 2019
  
  b7cf18c4
- Merge remote-tracking branch 'origin/dev' into dev · 4d6f652c
  dahai authored Apr 26, 2019
  
  4d6f652c
- 修改查询生成交接单数据 · 783de5a8
  dahai authored Apr 26, 2019
  
  783de5a8
- Merge remote-tracking branch 'origin/dev' into dev · 257fd941
  liboyang authored Apr 26, 2019
  
  257fd941
- 耗材管理 · 378ca191
  liboyang authored Apr 26, 2019
  
  378ca191
- 修改查询卡机统计报表详情添加卡机类型 · b9c5f0df
  dahai authored Apr 26, 2019
  
  b9c5f0df
- 修改保存卡机统计数据添加卡机类型身份证 · c32367e0
  dahai authored Apr 26, 2019
  
  c32367e0
- Merge remote-tracking branch 'origin/dev' into dev · 675c4f6e
  dahai authored Apr 26, 2019
  
  675c4f6e
- 修改查询新包日志 · 97c05cf3
  dahai authored Apr 26, 2019
```
修改查询制证信息管理数据
```
  97c05cf3
- Merge remote-tracking branch 'origin/dev' into dev · c24ea1fc
  cuizhiyuan authored Apr 26, 2019
  
  c24ea1fc