颜色放入storage里
Merge remote-tracking branch 'origin/develop' into develop