Commits · d42d03990367218d7acb8f34b8c43ab1e84078e3 · 王海 / TangKuPos

16 Mar, 2018 16 commits
- 详情 · 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 14 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
- 修复一个查询的问题; · 808de093
  zhang_z authored Mar 14, 2018
  
  808de093
- 支付失败时,上传错误信息; · 85ab96a6
  zhang_z authored Mar 14, 2018
  
  85ab96a6
- 百富重试次数为6,时间间隔为5s; · e554aa35
  zhang_z authored Mar 14, 2018
  
  e554aa35
- Merge remote-tracking branch 'origin/master' · 2d07da59
  zhang_z authored Mar 14, 2018
  
  2d07da59
- 延长支付连接时间,增加重试次数; · bc814fa7
  zhang_z authored Mar 14, 2018
```
增加营销计划的验证;
```
  bc814fa7
- Merge remote-tracking branch 'origin/master' · 8284dcae
  陈前 authored Mar 14, 2018
  
  8284dcae
- 服务 · ebd4c7f6
  陈前 authored Mar 14, 2018
  
  ebd4c7f6
- 标题不显示的问题; · 6a2cc996
  zhang_z authored Mar 14, 2018
  
  6a2cc996
- 同时按时候Dialog的问题; · 45691fb6
  zhang_z authored Mar 14, 2018
  
  45691fb6
- DBFactory的BUG修改; · dcabeab3
  zhang_z authored Mar 14, 2018
  
  dcabeab3
- 修复开单崩溃 · b890849f
  陈前 authored Mar 14, 2018
  
  b890849f
13 Mar, 2018 5 commits
- A8打印 · c87c41ae
  陈前 authored Mar 13, 2018
  
  c87c41ae
- 修改; · d49be09f
  zhang_z authored Mar 13, 2018
  
  d49be09f
- Merge remote-tracking branch 'origin/master' · 0ea7dadf
  zhang_z authored Mar 13, 2018
```
# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
```
  0ea7dadf
- 修改; · 3735bcc4
  zhang_z authored Mar 13, 2018
  
  3735bcc4
- Merge remote-tracking branch 'origin/master' · 84eb7b0b
  王海 authored Mar 13, 2018
  
  84eb7b0b