Commits · 69a59280be7a7e185fd42b6ff8b3800a0f8fb09e · 王海 / TangKuPos

21 Dec, 2017 6 commits
- Merge remote-tracking branch 'origin/master' · 69a59280
  陈前 authored Dec 21, 2017
```
# Conflicts:
#	app/src/main/res/values/strings.xml
```
  69a59280
- 现在有首页了，大家可以在CasherFragment写自己的跳转 · 119a177a
  陈前 authored Dec 21, 2017
  
  119a177a
- 录入颜色; · b4f7f4dc
  zhang_z authored Dec 21, 2017
  
  b4f7f4dc
- Merge branch 'master' of 192.168.254.154:w525721508/TangKuPos · a43e0c01
  zhang_z authored Dec 21, 2017
  
  a43e0c01
- 修改ui · 1a61ae0c
  王海 authored Dec 21, 2017
  
  1a61ae0c
- 基本构建; · 4a9ef3fe
  zhang_z authored Dec 21, 2017
  
  4a9ef3fe
20 Dec, 2017 4 commits
- 修改登录 · c1bfdd62
  王海 authored Dec 20, 2017
  
  c1bfdd62
- init · 31a852de
  王海 authored Dec 20, 2017
  
  31a852de
- init · e910907b
  王海 authored Dec 20, 2017
  
  e910907b
- all · 4aa6fd0a
  王海 authored Dec 20, 2017
  
  4aa6fd0a