Merge branch 'dev'

101captain

2022-03-14 85cf42314fc04a637f1a44e78c1e476a445bf0f3

 springcloud_k8s_panzhihuazhihuishequ/common/src/main/java/com/panzhihua/common/model/vos/property/ComPropertyEquipmentVO.java

@@ -62,7 +62,7 @@
    /**
     * 设备类型
     */
    @ApiModelProperty(value = "设备类型 1红外报警 2一键报警 ")
    @ApiModelProperty(value = "设备类型 1异常报警 2一键报警 ")
    private Integer type;

    @ApiModelProperty(value = "手机号")
@@ -73,4 +73,7 @@

    @ApiModelProperty(value = "回显路径")
    private String path;

    @ApiModelProperty(value = "设备状态（1.待服务 2.有异常报警 3.正常）")
    private Integer equipmentStatus;
}