Commits · 954cdc06f594fe068f91f1061041a91909a95c53 · 王海 / TangKuPos

26 Jan, 2018 26 commits
- 微调; · 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 14 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
- 添加修改; · 47620487
  zhang_z authored Jan 25, 2018
  
  47620487
- UI · 14c7cfb8
  陈前 authored Jan 25, 2018
  
  14c7cfb8
- Merge remote-tracking branch 'origin/master' · 651f74ab
  王海 authored Jan 25, 2018
  
  651f74ab
- 修改部分ui · 9e915da7
  王海 authored Jan 25, 2018
  
  9e915da7
- 修改颜色; · 6edc34a3
  zhang_z authored Jan 25, 2018
  
  6edc34a3
- bug修改; · 9422809e
  zhang_z authored Jan 25, 2018
  
  9422809e
- Merge remote-tracking branch 'origin/master' · 147af550
  zhang_z authored Jan 25, 2018
  
  147af550
- 添加换购; · 5608590f
  zhang_z authored Jan 25, 2018
  
  5608590f
- Merge remote-tracking branch 'origin/master' · a98b6016
  姜敏 authored Jan 25, 2018
  
  a98b6016
- 修改Radiobutton间距 · 509e1339
  姜敏 authored Jan 25, 2018
  
  509e1339
- Merge branch 'master' of 192.168.254.154:w525721508/TangKuPos · 6b1f03b4
  王海 authored Jan 25, 2018
  
  6b1f03b4
- Merge remote-tracking branch 'origin/master' · 39b0166f
  zhang_z authored Jan 25, 2018
  
  39b0166f