Merge branch 'v3.5.1' of http://git.ycjcjy.com/zhiyuxing/estateagents into v3.5.1

src/main/java/com/huiju/estateagents/service/impl/TaRecommendCustomerServiceImpl.java

             taRecommendCustomer.setVisitRecords(taPersonVisitRecordMapper.visitRecordByPersonId(page,personId));
             taRecommendCustomer.setVisitTimes(taPersonVisitRecordMapper.visitRecordByPersonId(page,personId).getRecords().size());
             taRecommendCustomer.setIntentions(taRecommendCustomerMapper.getCustomerIntentions(personId));
+            TdCity city = cityMapper.selectById(taRecommendCustomer.getCity());
+            if(null != city){
+                taRecommendCustomer.setCity(city.getName());
+            }
         }
         return taRecommendCustomer;
     }