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

lidongdong

2022-10-08 1ac9d6d25f32148354e46d11b814c306f475ee0d

 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;