Merge remote-tracking branch 'origin/test' into test

huanghongfa

2021-10-08 690b6ec75d6f9198d1ca292e107109b80646faf8

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/dto/DeviceDto.java

@@ -25,6 +25,8 @@
    /** 状态 */
    private String status;
    /** 呼叫人员ID */
    private String ori_number;
    /** 呼叫人员ID */
    private String userid;
    /** 呼叫iD */
    private String callid;