Merge branch 'retiredCadresDemo_zm' of git.xmmakeit.com:huangjiay/iot-platform-server into retiredCadresDemo_zm
