Commits · 4bf008dcd3d8a8881b7390d424408ea1b3695912 · 王海 / TangKuPos

30 Jan, 2018 13 commits
- Merge remote-tracking branch 'origin/master' · 4bf008dc
  王海 authored Jan 30, 2018
  
  4bf008dc
- 注释 · c5004f2c
  王海 authored Jan 30, 2018
  
  c5004f2c
- 修改搜索框; · 9f5d3859
  zhang_z authored Jan 30, 2018
  
  9f5d3859
- Merge branch 'master' of 192.168.254.154:w525721508/TangKuPos · e33d96e3
  zhang_z authored Jan 30, 2018
  
  e33d96e3
- bug修改; · b265ccad
  zhang_z authored Jan 30, 2018
  
  b265ccad
- Merge remote-tracking branch 'origin/master' · f3cead13
  王海 authored Jan 30, 2018
  
  f3cead13
- 修改键盘弹出 · 4ae77280
  王海 authored Jan 30, 2018
  
  4ae77280
- Merge remote-tracking branch 'origin/master' · 744ebfb9
  王海 authored Jan 30, 2018
  
  744ebfb9
- 修改ui · a3c02d7f
  王海 authored Jan 30, 2018
  
  a3c02d7f
- Merge remote-tracking branch 'origin/master' · 6018a9db
  zhang_z authored Jan 30, 2018
  
  6018a9db
- 修复所有的列表; · 4eb532b8
  zhang_z authored Jan 30, 2018
  
  4eb532b8
- Merge remote-tracking branch 'origin/master' · b43bb15b
  陈前 authored Jan 30, 2018
  
  b43bb15b
- UI · f8c9f8a9
  陈前 authored Jan 30, 2018
  
  f8c9f8a9
29 Jan, 2018 18 commits
- Merge remote-tracking branch 'origin/master' · c4b2740c
  姜敏 authored Jan 29, 2018
  
  c4b2740c
- 更改线的粗细 · c731857c
  姜敏 authored Jan 29, 2018
  
  c731857c
- Merge remote-tracking branch 'origin/master' · c04a281f
  王海 authored Jan 29, 2018
  
  c04a281f
- 修改ui · 0d428f43
  王海 authored Jan 29, 2018
  
  0d428f43
- 打印优化 · d3a7c027
  陈前 authored Jan 29, 2018
  
  d3a7c027
- 打印 · 4f9625bb
  陈前 authored Jan 29, 2018
  
  4f9625bb
- 搜索栏替换; · 2c3613a0
  zhang_z authored Jan 29, 2018
  
  2c3613a0
- Merge remote-tracking branch 'origin/master' · 1674ba10
  陈前 authored Jan 29, 2018
  
  1674ba10
- 打印 · 949518d9
  陈前 authored Jan 29, 2018
  
  949518d9
- Merge remote-tracking branch 'origin/master' · 63ba06a2
  zhang_z authored Jan 29, 2018
```
# Conflicts:
#	app/src/main/res/layout/view_empty.xml
```
  63ba06a2
- 修改好多东西; · 5f3bb6bb
  zhang_z authored Jan 29, 2018
  
  5f3bb6bb
- 修改注册绑定sn不能为空 · 6d07402c
  王海 authored Jan 29, 2018
  
  6d07402c
- Merge remote-tracking branch 'origin/master' · 8fb156ee
  王海 authored Jan 29, 2018
  
  8fb156ee
- 修改bug · 308ff0ca
  王海 authored Jan 29, 2018
  
  308ff0ca
- 定货 · f3d83183
  陈前 authored Jan 29, 2018
  
  f3d83183
- UI · 10720a7f
  陈前 authored Jan 29, 2018
  
  10720a7f
- Merge remote-tracking branch 'origin/master' · 06e8ff83
  陈前 authored Jan 29, 2018
  
  06e8ff83
- UI图标替换 · af8e99f9
  陈前 authored Jan 29, 2018
  
  af8e99f9
26 Jan, 2018 9 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