二期 频安宝bug

src/main/java/com/care/client/service/PinanbaoContactService.java

@@ -49,8 +49,6 @@ public class PinanbaoContactService {
                 HouseContactVO vo = new HouseContactVO();
                 BeanUtil.copyProperties(item,vo);
                 vo.setRelationTypeDesc(RelationTypeEnum.getCodeToName(vo.getRelationType()));
-                vo.setName(item.getContactName());
-                vo.setPhone(item.getContactPhone());
                 vos.add(vo);
             });
         }

src/main/java/com/care/client/service/PinanbaoDeviceService.java

@@ -207,8 +207,6 @@ public class PinanbaoDeviceService {
                 CareHouseContact careHouseContact = this.careHouseContactService.getById(item.getContactId());
                 BeanUtil.copyProperties(careHouseContact,vo);
                 vo.setRelationTypeDesc(RelationTypeEnum.getCodeToName(vo.getRelationType()));
-                vo.setName(careHouseContact.getContactName());
-                vo.setPhone(careHouseContact.getContactPhone());
                 vos.add(vo);
             });
         }

src/main/java/com/care/client/vo/HouseContactVO.java

@@ -38,13 +38,13 @@ public class HouseContactVO implements Serializable {
     private Long memberId;
 
     @ApiModelProperty("姓名")
-    private String name;
+    private String contactName;
 
     @ApiModelProperty("性别：M：男 W：女")
     private String gender;
 
     @ApiModelProperty("电话")
-    private String phone;
+    private String contactPhone;
 
 
     @ApiModelProperty("关系类别：kinsman亲属  neighbor：邻居")

src/main/java/com/care/keeper/vo/HouseContactVO.java

@@ -34,10 +34,10 @@ public class HouseContactVO implements Serializable {
     private Long memberId;
 
     @ApiModelProperty("姓名")
-    private String name;
+    private String contactName;
 
     @ApiModelProperty("电话")
-    private String phone;
+    private String contactPhone;
 
 
     @ApiModelProperty("关系类别：kinsman亲属  neighbor：邻居")