Merge branch 'master' into chende
修改服设备和用户的数目
Merge branch 'master' into chende