Merge remote-tracking branch 'origin/master'

k94314517

2024-03-21 68ae0e6a2dc077d8b85187ee3dbee4b87a6c9b90

 server/dmvisit_service/src/main/java/com/doumee/dao/business/model/Device.java

@@ -76,6 +76,9 @@
    @ApiModelProperty(value = "类型 0门禁 1车库", example = "1")
    @ExcelColumn(name="类型 0门禁 1车库")
    private Integer type;
    @ApiModelProperty(value = "是否园区出入口 0不是 1是", example = "1")
    @ExcelColumn(name="是否园区出入口 0不是 1是")
    private Integer isEntrance;

    @ApiModelProperty(value = "资源类型", example = "1")
    @ExcelColumn(name="资源类型")