Merge branch 'local_20221024' into huacheng_test

yanghui

2022-11-01 d6f2a3d6c68cc2626b3a1baef7383e66a0f7a58e

 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;