Commits · d16ddfaa7ff02f9760af64903fb4780b722a60b4 · 王海 / TangKuPos

19 Mar, 2018 10 commits
- 更改线的粗细 · d16ddfaa
  姜敏 authored Mar 19, 2018
  
  d16ddfaa
- Merge remote-tracking branch 'origin/master' · c8ec1a0c
  姜敏 authored Mar 19, 2018
  
  c8ec1a0c
- 更改线的粗细 · b9de7b1d
  姜敏 authored Mar 19, 2018
  
  b9de7b1d
- 二维码 · 83362939
  陈前 authored Mar 19, 2018
  
  83362939
- 删除时间保护; · 0ee2dcee
  zhang_z authored Mar 19, 2018
  
  0ee2dcee
- Merge remote-tracking branch 'origin/master' · 15acef1d
  姜敏 authored Mar 19, 2018
```
# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/C.java
```
  15acef1d
- 更改线的粗细 · 5d9b3b38
  姜敏 authored Mar 19, 2018
  
  5d9b3b38
- 反馈 · c7e04678
  陈前 authored Mar 19, 2018
  
  c7e04678
- 盘库 · 7675bfd5
  陈前 authored Mar 19, 2018
  
  7675bfd5
- 打印 · a55a4373
  陈前 authored Mar 19, 2018
  
  a55a4373
18 Mar, 2018 2 commits
- Merge remote-tracking branch 'origin/master' · c0b80ff6
  陈前 authored Mar 18, 2018
  
  c0b80ff6
- 打印 · f2e3fdf7
  陈前 authored Mar 18, 2018
  
  f2e3fdf7
16 Mar, 2018 20 commits
- Merge remote-tracking branch 'origin/master' · 0d153ec2
  zhang_z authored Mar 16, 2018
  
  0d153ec2
- 加强Fragment切换的保护; · c82bb919
  zhang_z authored Mar 16, 2018
  
  c82bb919
- 打印 · 50a6fe90
  陈前 authored Mar 16, 2018
  
  50a6fe90
- 打印 · e9298fb9
  陈前 authored Mar 16, 2018
  
  e9298fb9
- 详情 · d42d0399
  陈前 authored Mar 16, 2018
  
  d42d0399
- Merge remote-tracking branch 'origin/master' · 418ca5e9
  陈前 authored Mar 16, 2018
  
  418ca5e9
- 盘库 · f3ef8857
  陈前 authored Mar 16, 2018
  
  f3ef8857
- 优化摄像头权限获取流程; · 56fc5bf2
  zhang_z authored Mar 16, 2018
  
  56fc5bf2
- Merge remote-tracking branch 'origin/master' · 2dcd04f9
  zhang_z authored Mar 16, 2018
  
  2dcd04f9
- 优化摄像头权限获取流程; · 094b38f6
  zhang_z authored Mar 16, 2018
  
  094b38f6
- Merge remote-tracking branch 'origin/master' · 49cd5cf6
  陈前 authored Mar 16, 2018
  
  49cd5cf6
- 盘库 · 5f4175a5
  陈前 authored Mar 16, 2018
  
  5f4175a5
- Merge remote-tracking branch 'origin/master' · 2f963fb3
  王海 authored Mar 16, 2018
  
  2f963fb3
- 修改dialog关闭情况 · 06d0a34a
  王海 authored Mar 16, 2018
  
  06d0a34a
- 联迪打印 · 0cc64af1
  陈前 authored Mar 16, 2018
  
  0cc64af1
- Merge remote-tracking branch 'origin/master' · 01544a9a
  陈前 authored Mar 16, 2018
  
  01544a9a
- 盘库 · 3dc4f7d2
  陈前 authored Mar 16, 2018
  
  3dc4f7d2
- Merge remote-tracking branch 'origin/master' · df96b92a
  zhang_z authored Mar 16, 2018
  
  df96b92a
- 支付失败改成支付超时; · cc138c04
  zhang_z authored Mar 16, 2018
  
  cc138c04
- 盘库 · ba703a32
  陈前 authored Mar 16, 2018
  
  ba703a32
15 Mar, 2018 5 commits
- Merge remote-tracking branch 'origin/master' · cbe7ff36
  陈前 authored Mar 15, 2018
  
  cbe7ff36
- 盘库 · 806d55ce
  陈前 authored Mar 15, 2018
  
  806d55ce
- 修复了一个快速点击返回键可能导致系统崩溃的问题; · 0b8f325d
  zhang_z authored Mar 15, 2018
  
  0b8f325d
- Merge remote-tracking branch 'origin/master' · aab037d9
  zhang_z authored Mar 15, 2018
  
  aab037d9
- 修复bug; · 4f81e432
  zhang_z authored Mar 15, 2018
  
  4f81e432
14 Mar, 2018 3 commits
- Merge remote-tracking branch 'origin/master' · d79999db
  王海 authored Mar 14, 2018
  
  d79999db
- 演示版，sn设备型号提交 · fbe900a7
  王海 authored Mar 14, 2018
  
  fbe900a7
- 修复一个查询的问题; · 650fa8fb
  zhang_z authored Mar 14, 2018
  
  650fa8fb