Merge branch 'master' of http://10.1.235.20:3000/ipu/ipu-guide

* 'master' of http://10.1.235.20:3000/ipu/ipu-guide:
  修改文字颜色

# Conflicts:
#	show-server/src/main/webapp/rn/index.android.bundle
#	show-server/src/main/webapp/rn/index.android.bundle.meta