第二版

src/main/java/com/care/common/entity/CareHouseContact.java

@@ -47,16 +47,16 @@ public class CareHouseContact implements Serializable {
     private Long memberId;
 
     @ApiModelProperty("姓名")
-    @TableField("NAME")
-    private String name;
+    @TableField("CONTACT_NAME")
+    private String contactName;
 
     @ApiModelProperty("性别：M：男 W：女")
     @TableField("GENDER")
     private String gender;
 
     @ApiModelProperty("电话")
-    @TableField("PHONE")
-    private String phone;
+    @TableField("CONTACT_PHONE")
+    private String contactPhone;
 
 
     @ApiModelProperty("关系类别：kinsman亲属  neighbor：邻居")

src/main/resources/mybatis/BigSreenMapper.xml

@@ -248,8 +248,8 @@
           (select sdc.name from sys_dim_code sdc where sdc.dim_code = a.status and sdc.type_code='older_status') older_status,
           (select c.status from care_event_order c where c.older_id = a.id order by c.create_time desc limit 1) older_event_status,
            d.id contact_id,
-          d.name contact_name,
-          d.phone contact_phone,
+          d.contact_name contact_name,
+          d.contact_phone contact_phone,
           (select sdc.name from sys_dim_code sdc where sdc.dim_code = d.relation_type and sdc.type_code='older_contact_relation_type') relation_type
         FROM care_older a left join care_house_older_rel chor on chor.older_id = a.id
         left join care_house_contact_rel chcr on chcr.house_id=chor.house_id