Commits · 1.4.6_ · lify / RvApp

26 Sep, 2019 34 commits
- Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im · b55d27fc
  jianglx authored Sep 26, 2019
  
  b55d27fc
- bug修改 · d34068f5
  linfeng authored Sep 26, 2019
  
  d34068f5
- Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im · 34ae4073
  jianglx authored Sep 26, 2019
  
  34ae4073
- bug修改 · f6d8b0ab
  linfeng authored Sep 26, 2019
  
  f6d8b0ab
- 修改活动规则的部分显示错误 · b8f304fd
  jianglx authored Sep 26, 2019
  
  b8f304fd
- Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im · 11c11946
  jianglx authored Sep 26, 2019
```
# Conflicts:
#	RvClient/build.gradle
```
  11c11946
- Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im · d354d4ca
  jianglx authored Sep 26, 2019
  
  d354d4ca
- Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im · 5a8972b4
  jianglx authored Sep 26, 2019
```
# Conflicts:
#	RvClient/build.gradle
```
  5a8972b4
- bug修改 · 081602a5
  linfeng authored Sep 26, 2019
  
  081602a5
- Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im · f81cb57b
  jianglx authored Sep 26, 2019
  
  f81cb57b
- bug修改 · 7368186e
  linfeng authored Sep 26, 2019
  
  7368186e
- Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im · 5c196c3a
  jianglx authored Sep 26, 2019
  
  5c196c3a
- bug修改 · edad51b2
  linfeng authored Sep 26, 2019
  
  edad51b2
- Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im · 167a1566
  jianglx authored Sep 26, 2019
```
# Conflicts:
#	RvClient/build.gradle
```
  167a1566
- Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im · 1540ea54
  jianglx authored Sep 26, 2019
  
  1540ea54
- Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im · 6725d897
  jianglx authored Sep 26, 2019
```
# Conflicts:
#	RvClient/build.gradle
```
  6725d897
- bug修改 · d0cff159
  linfeng authored Sep 26, 2019
  
  d0cff159
- Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im · d60a99c5
  jianglx authored Sep 26, 2019
  
  d60a99c5
- Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im · 6e3e83af
  jianglx authored Sep 26, 2019
```
# Conflicts:
#	RvClient/build.gradle
```
  6e3e83af
- bug修改 · cb304190
  linfeng authored Sep 26, 2019
  
  cb304190
- bug修改 · 5f3283c2
  linfeng authored Sep 26, 2019
  
  5f3283c2
- Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im · dc0ed428
  jianglx authored Sep 26, 2019
```
# Conflicts:
#	RvClient/build.gradle
```
  dc0ed428
- bug修改 · 358e4c5c
  linfeng authored Sep 26, 2019
  
  358e4c5c
- Merge branch 'master-video' of http://113.105.137.151:22280/lify/rvapp into dev_im · 558d86c3
  jianglx authored Sep 26, 2019
```
# Conflicts:
#	RvClient/build.gradle
```
  558d86c3
- Merge branch 'dev_im' of http://113.105.137.151:22280/lify/rvapp into master-video · bd1248a9
  linfeng authored Sep 26, 2019
  
  bd1248a9
- 提交未上传的图片 · 0bd532de
  jianglx authored Sep 26, 2019
  
  0bd532de
- bug修改 · abafadc0
  linfeng authored Sep 26, 2019
  
  abafadc0
- 修改海报页面闪退的问题 · f9baa3c7
  jianglx authored Sep 26, 2019
  
  f9baa3c7
- bug修改 · 5ae074e0
  linfeng authored Sep 26, 2019
  
  5ae074e0
- bug修改 · 02a17a88
  linfeng authored Sep 26, 2019
  
  02a17a88
- 修改im配置为空闪退的问题 · 617f25eb
  jianglx authored Sep 26, 2019
  
  617f25eb
- 修改上线第一版本的bug · b39589f0
  jianglx authored Sep 26, 2019
  
  b39589f0
- bug修改 · 5ec63cb4
  linfeng authored Sep 26, 2019
  
  5ec63cb4
- bug修改 · 79f726af
  linfeng authored Sep 26, 2019
  
  79f726af
25 Sep, 2019 6 commits
- Merge branch 'dev_im' of http://113.105.137.151:22280/lify/rvapp into master-video · e3478875
  linfeng authored Sep 25, 2019
  
  e3478875
- 修改im的正式环境 · 10d35630
  jianglx authored Sep 25, 2019
  
  10d35630
- bug修改 · bc69266d
  linfeng authored Sep 25, 2019
  
  bc69266d
- bug修改 · d0753893
  linfeng authored Sep 25, 2019
  
  d0753893
- Merge branch 'dev_im' of http://113.105.137.151:22280/lify/rvapp into master-video · 05400f0c
  linfeng authored Sep 25, 2019
  
  05400f0c
- 修改生成海报名称改为昵称 · 0ea337f9
  jianglx authored Sep 25, 2019
  
  0ea337f9