Commits · 7948f25be68bc1f3f30576ac844a05c7b146b5f9 · zhangyusheng / YX_IDENT_beijing_auxiliary_YD

07 May, 2019 1 commit
- push · 7948f25b
  dahai authored May 07, 2019
  
  7948f25b
06 May, 2019 11 commits
- 查询未审核的耗材记录和所选日期的已审核的耗材记录 · 898fc81c
  liboyang authored May 06, 2019
  
  898fc81c
- Merge remote-tracking branch 'origin/dev' into dev · 970805ae
  liboyang authored May 06, 2019
  
  970805ae
- 查询未审核的耗材记录和所选日期的已审核的耗材记录 · 69868142
  liboyang authored May 06, 2019
  
  69868142
- Merge remote-tracking branch 'origin/dev' into dev · 901a6f17
  dahai authored May 06, 2019
  
  901a6f17
- 修改查询卡机操作记录未审核的详情 · e2e27668
  dahai authored May 06, 2019
  
  e2e27668
- 膜打印更新工作组 · 48c31f4a
  liboyang authored May 06, 2019
  
  48c31f4a
- 膜打印更新工作组 · 7ab7d08a
  liboyang authored May 06, 2019
  
  7ab7d08a
- Merge branch 'dev' of… · 2d751025
  liboyang authored May 06, 2019
```
Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev
```
  2d751025
- 查询提交人上传的废证详情 · d57c79cd
  liboyang authored May 06, 2019
  
  d57c79cd
- Merge branch 'dev' of… · 4f2e970e
  ad authored May 06, 2019
```
Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev
```
  4f2e970e
- 查询提交人上传的废证详情 · 0bd6a4f2
  liboyang authored May 06, 2019
  
  0bd6a4f2
05 May, 2019 1 commit
- 修改页面排版 · e3208199
  ad authored May 05, 2019
  
  e3208199
30 Apr, 2019 3 commits
- Merge branch 'dev' of… · 4698358a
  ad authored Apr 30, 2019
```
Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev
```
  4698358a
- 添加并修改查询提交人提交的废证详情 · 01d623dd
  dahai authored Apr 30, 2019
  
  01d623dd
- Merge branch 'dev' of… · 318e838f
  ad authored Apr 30, 2019
```
Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev
```
  318e838f
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 15 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