修改 InteractionVO 文件

middleware/src/main/code/com/wdkl/ncs/android/middleware/model/vo/InteractionVO.java

@@ -72,6 +72,10 @@ public class InteractionVO extends InteractionDO {
     @ApiModelProperty(value = "发起端设备的SIP账号", required = false)
     private String fromSipId;
 
+    @Column(name = "from_device_type")
+    @ApiModelProperty(value = "发起端设备的设备类型", required = false)
+    private Integer fromDeviceType;
+
 
     @Column(name = "to_eth_mac")
     @ApiModelProperty(value = "目的端设备的有线以太网卡MAC地址", required = false)
@@ -86,6 +90,10 @@ public class InteractionVO extends InteractionDO {
     @ApiModelProperty(value = "目的端设备的SIP账号", required = false)
     private String toSipId;
 
+    @Column(name = "to_device_type")
+    @ApiModelProperty(value = "目的端设备的设备类型", required = false)
+    private Integer toDeviceType;
+
     /** 空间结构 **/
 
     @Column(name = "from_frame_type")
@@ -116,15 +124,18 @@ public class InteractionVO extends InteractionDO {
     private String toFrameFullName;
 
 
-
     @Column(name = "relative_id")
     @ApiModelProperty(value = "亲属id,外部来电时，from_member亲属的memberId", required = false)
     private Integer relativeId;
 
     @Column(name = "relative_name")
-    @ApiModelProperty(value = "外部来电时，from_member亲属名字", required = false)
+    @ApiModelProperty(value = "外部来电时，from_member亲属关系", required = false)
     private String relativeName;
 
+    @Column(name = "outerior_action_name")
+    @ApiModelProperty(value = "外部来电时，from_member亲属名字", required = false)
+    private String outeriorActionName;
+
 
     public Integer getFromCustomerId() {
         return fromCustomerId;
@@ -318,6 +329,30 @@ public class InteractionVO extends InteractionDO {
         this.relativeName = relativeName;
     }
 
+    public String getOuteriorActionName() {
+        return outeriorActionName;
+    }
+
+    public void setOuteriorActionName(String outeriorActionName) {
+        this.outeriorActionName = outeriorActionName;
+    }
+
+    public Integer getFromDeviceType() {
+        return fromDeviceType;
+    }
+
+    public void setFromDeviceType(Integer fromDeviceType) {
+        this.fromDeviceType = fromDeviceType;
+    }
+
+    public Integer getToDeviceType() {
+        return toDeviceType;
+    }
+
+    public void setToDeviceType(Integer toDeviceType) {
+        this.toDeviceType = toDeviceType;
+    }
+
     @Override
     public String toString() {
         return "InteractionVO{" +
@@ -334,9 +369,11 @@ public class InteractionVO extends InteractionDO {
                 ", fromEthMac='" + fromEthMac + '\'' +
                 ", fromEthIp='" + fromEthIp + '\'' +
                 ", fromSipId='" + fromSipId + '\'' +
+                ", fromDeviceType='" + fromDeviceType + '\'' +
                 ", toEthMac='" + toEthMac + '\'' +
                 ", toEthIp='" + toEthIp + '\'' +
                 ", toSipId='" + toSipId + '\'' +
+                ", toDeviceType='" + toDeviceType + '\'' +
                 ", fromFrameType=" + fromFrameType +
                 ", fromFrameName='" + fromFrameName + '\'' +
                 ", fromFrameFullName='" + fromFrameFullName + '\'' +
@@ -345,6 +382,7 @@ public class InteractionVO extends InteractionDO {
                 ", toFrameFullName='" + toFrameFullName + '\'' +
                 ", relativeId=" + relativeId +
                 ", relativeName='" + relativeName + '\'' +
+                ", outeriorActionName='" + outeriorActionName + '\'' +
                 '}';
     }
 }