Merge branch 'test' into 'test_bak'

罗元桥

2021-09-26 931ea9dcdf62ea348f1811b9faf95d07ab1c1ac8

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

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

    @ApiModelProperty(value = "手机号")
    private String phone;

    @ApiModelProperty(value = "街路巷id")
    private Long villageId;

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