Merge branch 'develop' of http://git.ycjcjy.com/marketing/services into develop

src/main/java/com/yunzhi/marketing/xlk/controller/ChannelCustomerController.java

         // 所属楼盘
         TaBuilding taBuilding = null;
         if (null != customer.getBuildingId()) {
-            iTaBuildingService.getById(customer.getBuildingId());
+            taBuilding = iTaBuildingService.getById(customer.getBuildingId());
         }
 
         // 跟进信息