Commits · 01544a9a7dbd079e074688df89dbfcc9d3f3a953 · 王海 / TangKuPos

16 Mar, 2018 5 commits
- 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 6 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
- 演示版，sn设备型号提交 · 67b002e5
  王海 authored Mar 13, 2018
  
  67b002e5
12 Mar, 2018 8 commits
- 收费 · 7e4bdbca
  陈前 authored Mar 12, 2018
  
  7e4bdbca
- 百富打包演示环境 · 1e5dc474
  王海 authored Mar 12, 2018
  
  1e5dc474
- 添加二维码支付; · 8d3b7dfd
  zhang_z authored Mar 12, 2018
  
  8d3b7dfd
- BUG修改; · 36966005
  zhang_z authored Mar 12, 2018
  
  36966005
- 优化结构和流程; · 02586e4a
  zhang_z authored Mar 12, 2018
  
  02586e4a
- 整合新的支付模块; · cde96918
  zhang_z authored Mar 12, 2018
  
  cde96918
- 打包; · 332b953f
  zhang_z authored Mar 12, 2018
  
  332b953f
- BUG修改; · 88dc5b5e
  zhang_z authored Mar 12, 2018
  
  88dc5b5e
08 Mar, 2018 2 commits
- 支付module结构优化; · 992b09bd
  zhang_z authored Mar 08, 2018
  
  992b09bd
- 换购商品; · 57b9dc33
  zhang_z authored Mar 08, 2018
  
  57b9dc33