Commits · 1e75f4ede83fe901e79f46de05a66139c614cf2f · zhangyusheng / YX_IDENT_beijing_auxiliary_YD

15 May, 2019 1 commit
- push · 1e75f4ed
  dahai authored May 15, 2019
  
  1e75f4ed
14 May, 2019 1 commit
- 添加异地证数据核验报表 · 537285e5
  dahai authored May 14, 2019
  
  537285e5
13 May, 2019 4 commits
- push · eb776136
  dahai authored May 13, 2019
  
  eb776136
- push · 895de230
  dahai authored May 13, 2019
  
  895de230
- push · 4cff9553
  dahai authored May 13, 2019
  
  4cff9553
- push · 69cd7224
  dahai authored May 13, 2019
  
  69cd7224
11 May, 2019 3 commits
- push · 631a70c4
  dahai authored May 11, 2019
  
  631a70c4
- push · 42b8cdb3
  dahai authored May 11, 2019
  
  42b8cdb3
- 添加删除废证详情 · 2028e7bd
  dahai authored May 11, 2019
```
添加查询余证详情
```
  2028e7bd
08 May, 2019 5 commits
- push · 53d307a2
  dahai authored May 08, 2019
  
  53d307a2
- push · feca00ef
  dahai authored May 08, 2019
  
  feca00ef
- 修改查询提交人的废证详情 · 039b8e11
  dahai authored May 08, 2019
  
  039b8e11
- Merge remote-tracking branch 'origin/dev' into dev · fc05e127
  dahai authored May 08, 2019
  
  fc05e127
- 修改查询膜、卡体统计报表 · d89297fd
  dahai authored May 08, 2019
  
  d89297fd
07 May, 2019 16 commits
- Merge remote-tracking branch 'origin/dev' into dev · 5d461a68
  ad authored May 07, 2019
  
  5d461a68
- 修改页面词语描述 · 7bef42b8
  ad authored May 07, 2019
  
  7bef42b8
- Merge remote-tracking branch 'origin/dev' into dev · 6782a3e0
  dahai authored May 07, 2019
  
  6782a3e0
- 修改查询膜、卡体出入库记录（管理人员查看全部工作人员查看本人记录） · deced8b9
  dahai authored May 07, 2019
  
  deced8b9
- 修改页面词语描述，添加耗材数量校验 · effdda8f
  ad authored May 07, 2019
  
  effdda8f
- Merge remote-tracking branch 'origin/dev' into dev · 42b1cf44
  dahai authored May 07, 2019
```
# Conflicts:
#	src/main/resources/static/views/filmManagement/filmManagement.html
```
  42b1cf44
- 搜索框添加工作组属性 · 3c1c71da
  dahai authored May 07, 2019
  
  3c1c71da
- 修改页面词语描述，添加出库数量校验，注释分拣任务单选择框禁用 · 0710ea76
  ad authored May 07, 2019
  
  0710ea76
- 分拣转出任务单弹框bug · ba56389b
  liboyang authored May 07, 2019
  
  ba56389b
- Merge remote-tracking branch 'origin/dev' into dev · c60202fa
  liboyang authored May 07, 2019
  
  c60202fa
- 分拣转出任务单弹框bug · 92d6d24c
  liboyang authored May 07, 2019
  
  92d6d24c
- push · 25f8ca54
  dahai authored May 07, 2019
  
  25f8ca54
- Merge remote-tracking branch 'origin/dev' into dev · 22e694ae
  liboyang authored May 07, 2019
  
  22e694ae
- 膜管理页面上传 · 60ef1a62
  liboyang authored May 07, 2019
  
  60ef1a62
- push · c9bf7319
  dahai authored May 07, 2019
  
  c9bf7319
- push · 7948f25b
  dahai authored May 07, 2019
  
  7948f25b
06 May, 2019 10 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