Merge pull request #2 from HuaWei-Electric/zhanghb

Zhanghb
Merge branch 'zhanghb'
Merge remote-tracking branch 'origin/xiaoyj'
Fixed bug created by zhanghb