Commits · 308ff0cac96ed770d1187acaf1a30f10338429ed · 王海 / TangKuPos

29 Jan, 2018 1 commit
- 修改bug · 308ff0ca
  王海 authored Jan 29, 2018
  
  308ff0ca
26 Jan, 2018 37 commits
- 更改线的粗细 · 6e3b0cea
  姜敏 authored Jan 26, 2018
  
  6e3b0cea
- 修改bug · 8357c1a7
  王海 authored Jan 26, 2018
  
  8357c1a7
- 支付服务器切换为原来服务器 · 5f3ed6ee
  王海 authored Jan 26, 2018
  
  5f3ed6ee
- Merge remote-tracking branch 'origin/master' · 5c60f6c7
  zhang_z authored Jan 26, 2018
  
  5c60f6c7
- 提交修改; · c4e01401
  zhang_z authored Jan 26, 2018
  
  c4e01401
- Merge remote-tracking branch 'origin/master' · 04649eae
  姜敏 authored Jan 26, 2018
  
  04649eae
- 更改线的粗细 · c0913f68
  姜敏 authored Jan 26, 2018
  
  c0913f68
- Merge remote-tracking branch 'origin/master' · 32a34085
  王海 authored Jan 26, 2018
  
  32a34085
- 新增调试模式 · 9174bcd2
  王海 authored Jan 26, 2018
  
  9174bcd2
- 提交修改; · 8c1fa464
  zhang_z authored Jan 26, 2018
  
  8c1fa464
- 修改; · ef489e72
  zhang_z authored Jan 26, 2018
  
  ef489e72
- 微调; · 954cdc06
  zhang_z authored Jan 26, 2018
  
  954cdc06
- Merge remote-tracking branch 'origin/master' · 15ebb731
  zhang_z authored Jan 26, 2018
  
  15ebb731
- 营销计划空页面; · 20d929c3
  zhang_z authored Jan 26, 2018
  
  20d929c3
- Merge remote-tracking branch 'origin/master' · d053fdea
  陈前 authored Jan 26, 2018
  
  d053fdea
- 打印 · 35e779d9
  陈前 authored Jan 26, 2018
  
  35e779d9
- Merge remote-tracking branch 'origin/master' · 84ed2d09
  王海 authored Jan 26, 2018
  
  84ed2d09
- 修改焦点 · 4f1313ce
  王海 authored Jan 26, 2018
  
  4f1313ce
- Merge remote-tracking branch 'origin/master' · dbc7d680
  zhang_z authored Jan 26, 2018
  
  dbc7d680
- 修改网络异常; · 7a9864a2
  zhang_z authored Jan 26, 2018
  
  7a9864a2
- Merge remote-tracking branch 'origin/master' · d5feb9e3
  王海 authored Jan 26, 2018
  
  d5feb9e3
- 修改焦点 · 20ce263a
  王海 authored Jan 26, 2018
  
  20ce263a
- Merge remote-tracking branch 'origin/master' · 8e8a349a
  姜敏 authored Jan 26, 2018
  
  8e8a349a
- 更改线的粗细 · e3200bf7
  姜敏 authored Jan 26, 2018
  
  e3200bf7
- Merge remote-tracking branch 'origin/master' · b3276c53
  zhang_z authored Jan 26, 2018
  
  b3276c53
- 常量; · 5e18b93a
  zhang_z authored Jan 26, 2018
  
  5e18b93a
- Merge remote-tracking branch 'origin/master' · 21a80973
  陈前 authored Jan 26, 2018
  
  21a80973
- 权限控制 · 99c73292
  陈前 authored Jan 26, 2018
  
  99c73292
- 修复一个支付失败之后,无法再次支付的问题; · 5b0832cc
  zhang_z authored Jan 26, 2018
  
  5b0832cc
- 修复一个支付失败之后,无法再次支付的问题; · b0b87b98
  zhang_z authored Jan 26, 2018
  
  b0b87b98
- 支付方式; · da02adb3
  zhang_z authored Jan 26, 2018
  
  da02adb3
- Merge remote-tracking branch 'origin/master' · 08eb5f69
  zhang_z authored Jan 26, 2018
  
  08eb5f69
- 加长转圈的时间,以规避一些问题; · 64974046
  zhang_z authored Jan 26, 2018
  
  64974046
- Merge branch 'master' of 192.168.254.154:w525721508/TangKuPos · eaad1127
  陈前 authored Jan 26, 2018
  
  eaad1127
- Merge remote-tracking branch 'origin/master' · e7a6be1a
  姜敏 authored Jan 26, 2018
  
  e7a6be1a
- 修改Radiobutton间距 · c9e4370f
  姜敏 authored Jan 26, 2018
  
  c9e4370f
- 加保护; · 586f5ae3
  zhang_z authored Jan 26, 2018
  
  586f5ae3
25 Jan, 2018 2 commits
- Merge remote-tracking branch 'origin/master' · 629f9d7f
  zhang_z authored Jan 25, 2018
  
  629f9d7f
- Merge remote-tracking branch 'origin/master' · a2887df1
  陈前 authored Jan 25, 2018
```
# Conflicts:
#	app/src/main/java/com/xingdata/zzdpos/util/SystemUtil.java
```
  a2887df1