Merge branch 'master' of https://t-git.51gjj.com/fangbin/51business

app/model/realestate/new_house.js

@@ -69,7 +69,7 @@ module.exports = app => {
             allowNull: true
         },
         house_type: {
-            type: INTEGER,
+            type: STRING,
             allowNull: true
         },
         reference_avg_price: {

app/service/house/v2/new_house.js

@@ -460,6 +460,7 @@ class NewHouseService extends Service {
             price: Number(newHouseInfo.reference_avg_price) === 0 ? '--' : Number(newHouseInfo.reference_avg_price),
             corner: newHouseInfo.corner || '',
             sale_type: SaleType[newHouseInfo.sale_type] || SaleType[3],//销售状态 0未开售，1售罄,2预售,3在售
+            property_type: newHouseInfo.house_type.split(',').slice(0, 2),//物业类型
         }
         return ret;
     }