完成智慧生活部分
11
Merge remote-tracking branch 'origin/master' into sevenDev
代码合并