Merge branch 'master-chw-bug' of http://113.105.137.151:22280/youjj/cloud-platform into master-chw-bug