Merge branch 'feature_chw_zjw' of http://113.105.137.151:22280/youjj/cloud-platform into feature_chw_zjw