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

huanghongfa

2021-09-22 245eb51063dca6bcb9c67c5b4b400b6f2b04453a

 springcloud_k8s_panzhihuazhihuishequ/service_property/src/main/java/com/panzhihua/service_property/entity/ComPropertyEquipment.java

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

    /**
     * 手机号码
     */
    @ApiModelProperty("手机号")
    private String phone;

    /**
     * 街路巷id
     */
    @ApiModelProperty("街路巷id")
    private Long villageId;
}