Merge branch 'hotfix/cate' into 'master'

调整分类接口创意生活字段名称



See merge request !1766

@@ -70,8 +70,11 @@ module.exports = class extends global.yoho.BaseModel {
             // 统一频道名称
             result.data.boys = result.data.boy;
             result.data.girls = result.data.girl;
+            result.data.lifestyle = result.data.lifestyle || result.data.LifeStyle;
+
             _.unset(result.data, 'boy');
             _.unset(result.data, 'girl');
+            _.unset(result.data, 'LifeStyle');
 
             return result.data;
         }).then((list) => {