Commits · 783de5a8e15dbcba680021c708b5b38733931eb0 · zhangyusheng / YX_IDENT_beijing_auxiliary_YD

26 Apr, 2019 8 commits
- 修改查询生成交接单数据 · 783de5a8
  dahai authored Apr 26, 2019
  
  783de5a8
- 修改查询卡机统计报表详情添加卡机类型 · 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
- 更新 04 26 · 7754ee23
  cuizhiyuan authored Apr 26, 2019
  
  7754ee23
- push · df4f00d6
  dahai authored Apr 26, 2019
  
  df4f00d6
25 Apr, 2019 3 commits
- 修改页面 · 7bd9665f
  cuizhiyuan authored Apr 25, 2019
  
  7bd9665f
- Merge remote-tracking branch 'origin/dev' into dev · 042ef751
  cuizhiyuan authored Apr 25, 2019
  
  042ef751
- 添加页面 · 0aebfbf8
  cuizhiyuan authored Apr 25, 2019
  
  0aebfbf8
24 Apr, 2019 19 commits
- Merge remote-tracking branch 'origin/dev' into dev · 4827033b
  Administrator authored Apr 24, 2019
  
  4827033b
- Merge remote-tracking branch 'origin/dev' into dev · d8c9b3f4
  dahai authored Apr 24, 2019
  
  d8c9b3f4
- 确认收到实体证，系统自动生成入库记录，为再次交接提供信息 · 7e1c4107
  dahai authored Apr 24, 2019
  
  7e1c4107
- push · 76d5b2af
  Administrator authored Apr 24, 2019
  
  76d5b2af
- 添加错误信息下拉框 · a29aa240
  cuizhiyuan authored Apr 24, 2019
  
  a29aa240
- Merge remote-tracking branch 'origin/dev' into dev · d12a70ad
  cuizhiyuan authored Apr 24, 2019
```
# Conflicts:
#	src/main/resources/static/index.html
#	src/main/resources/static/js/app.js
```
  d12a70ad
- 新增报表 · c294aa22
  cuizhiyuan authored Apr 24, 2019
  
  c294aa22
- 添加查询妥投失败原因API · 431f6eb2
  dahai authored Apr 24, 2019
  
  431f6eb2
- 修改更改邮寄备注信息 · db204755
  dahai authored Apr 24, 2019
  
  db204755
- push · c0d71a41
  dahai authored Apr 24, 2019
  
  c0d71a41
- push · 37ffad5b
  dahai authored Apr 24, 2019
  
  37ffad5b
- push · 49148be8
  dahai authored Apr 24, 2019
  
  49148be8
- push · 860f3ff7
  dahai authored Apr 24, 2019
  
  860f3ff7
- push · 6e2b9224
  dahai authored Apr 24, 2019
  
  6e2b9224
- 膜打印更新工作组 · 933c6fc6
  liboyang authored Apr 24, 2019
  
  933c6fc6
- 修改膜打印更新工作组数据API · d345bead
  dahai authored Apr 24, 2019
  
  d345bead
- Merge remote-tracking branch 'origin/dev' into dev · 62b4390d
  dahai authored Apr 24, 2019
  
  62b4390d
- 修改查询生成交接单数据 · b933e36e
  dahai authored Apr 24, 2019
  
  b933e36e
- 打印交接单 · 707ddd93
  liboyang authored Apr 24, 2019
  
  707ddd93
23 Apr, 2019 10 commits
- Merge remote-tracking branch 'origin/dev' into dev · 7cea6b4c
  liboyang authored Apr 23, 2019
  
  7cea6b4c
- 打印条数限制 · 79dcf199
  liboyang authored Apr 23, 2019
  
  79dcf199
- Merge remote-tracking branch 'origin/dev' into dev · 70f3cdbb
  ad authored Apr 23, 2019
  
  70f3cdbb
- 修改页面排版 · 2595600e
  ad authored Apr 23, 2019
  
  2595600e
- Merge remote-tracking branch 'origin/dev' into dev · 28b7f30b
  liboyang authored Apr 23, 2019
  
  28b7f30b
- 打印交接单 · 9cd3a377
  liboyang authored Apr 23, 2019
  
  9cd3a377
- push · b5dd5406
  dahai authored Apr 23, 2019
  
  b5dd5406
- push · 33cbeb71
  dahai authored Apr 23, 2019
  
  33cbeb71
- Merge branch 'dev' of… · 2d242550
  ad authored Apr 23, 2019
```
Merge branch 'dev' of http://121.22.111.250:8000/YX_IDENT_auxiliary/YX_IDENT_beijing_auxiliary into dev
```
  2d242550
- 修改查询任务单详情废证数量不一直存在问题 · 935957bc
  dahai authored Apr 23, 2019
  
  935957bc