Commits · c4b2740ceb30ed1445e40063ac94427406fae406 · 王海 / TangKuPos

29 Jan, 2018 17 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
- 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 23 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