Commits · a61f8a730d2d7a2a9562a879668e5cb1ee57d5da · 王海 / TangKuPos

22 Dec, 2017 7 commits
- Merge remote-tracking branch 'origin/master' · a61f8a73
  王海 authored Dec 22, 2017
  
  a61f8a73
- 修改title · 38f3abab
  王海 authored Dec 22, 2017
  
  38f3abab
- 修改BUG; · 4f0dcac5
  zhang_z authored Dec 22, 2017
  
  4f0dcac5
- 录入颜色; · 4d17c057
  zhang_z authored Dec 22, 2017
  
  4d17c057
- Merge remote-tracking branch 'origin/master' · 28ba590e
  王海 authored Dec 22, 2017
```
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/values/dimens.xml
```
  28ba590e
- 修改样式 · 11465d72
  王海 authored Dec 22, 2017
  
  11465d72
- 提交代码; · 023764ee
  zhang_z authored Dec 22, 2017
  
  023764ee
21 Dec, 2017 33 commits
- Merge remote-tracking branch 'origin/master' · 09991eae
  zhang_z authored Dec 21, 2017
```
# Conflicts:
#	app/src/main/AndroidManifest.xml
```
  09991eae
- 收款页面基本完成; · 452f5847
  zhang_z authored Dec 21, 2017
  
  452f5847
- 公告开始 · 6b9d7b05
  陈前 authored Dec 21, 2017
  
  6b9d7b05
- 我的 · 222a4677
  陈前 authored Dec 21, 2017
  
  222a4677
- Merge remote-tracking branch 'origin/master' · d1419b6e
  王海 authored Dec 21, 2017
```
# Conflicts:
#	app/src/main/AndroidManifest.xml
```
  d1419b6e
- 修改逻辑 · fbdd9024
  王海 authored Dec 21, 2017
  
  fbdd9024
- Merge remote-tracking branch 'origin/master' · 915178f0
  陈前 authored Dec 21, 2017
```
# Conflicts:
#	app/src/main/res/values/styles.xml
```
  915178f0
- 三首页 · 89a5e5c3
  陈前 authored Dec 21, 2017
  
  89a5e5c3
- 收款bug修改; · 12c81300
  zhang_z authored Dec 21, 2017
  
  12c81300
- Merge remote-tracking branch 'origin/master' · 340a980f
  zhang_z authored Dec 21, 2017
  
  340a980f
- 收款页面; · e4258168
  zhang_z authored Dec 21, 2017
  
  e4258168
- Merge remote-tracking branch 'origin/master' · c4fa9ba3
  王海 authored Dec 21, 2017
  
  c4fa9ba3
- 修改ui · 99df8c62
  王海 authored Dec 21, 2017
  
  99df8c62
- Merge remote-tracking branch 'origin/master' · 7123fa39
  姜敏 authored Dec 21, 2017
  
  7123fa39
- 添加颜色 · af240109
  姜敏 authored Dec 21, 2017
  
  af240109
- 修改ui · 337b9f37
  王海 authored Dec 21, 2017
  
  337b9f37
- Merge remote-tracking branch 'origin/master' · f3172525
  王海 authored Dec 21, 2017
```
# Conflicts:
#	app/src/main/AndroidManifest.xml
```
  f3172525
- 修改ui · 35bc0154
  王海 authored Dec 21, 2017
  
  35bc0154
- 修改计算器; · ef7e8cfc
  zhang_z authored Dec 21, 2017
  
  ef7e8cfc
- Merge remote-tracking branch 'origin/master' · bcadfa76
  zhang_z authored Dec 21, 2017
  
  bcadfa76
- 计算器基本完成; · 48a3a245
  zhang_z authored Dec 21, 2017
  
  48a3a245
- Merge remote-tracking branch 'origin/master' · 21eaf788
  王海 authored Dec 21, 2017
  
  21eaf788
- 修改ui · 34cca944
  王海 authored Dec 21, 2017
  
  34cca944
- Merge remote-tracking branch 'origin/master' · 1708d114
  zhang_z authored Dec 21, 2017
```
# Conflicts:
#	app/src/main/AndroidManifest.xml
```
  1708d114
- 提交新颜色; · 7be3a603
  zhang_z authored Dec 21, 2017
```
修改PaymentFragment;
```
  7be3a603
- 修复清单 · 5ab5966c
  陈前 authored Dec 21, 2017
  
  5ab5966c
- ！ · becfc706
  陈前 authored Dec 21, 2017
  
  becfc706
- 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
- 修改bug · 10703f05
  王海 authored Dec 21, 2017
  
  10703f05
- 录入颜色; · 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