Merge remote-tracking branch 'origin/master'

k94314517

2024-02-29 16772c5dc27772c2eee57d2eab061ad15e8ad87e

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

@@ -95,6 +95,9 @@
    @ApiModelProperty(value = "设备类型编码")
    @ExcelColumn(name="设备类型编码")
    private String devTypeCode;
    @ApiModelProperty(value = "门禁设备类型型号")
    @ExcelColumn(name="门禁设备类型型号")
    private String devTypeDesc;

    @ApiModelProperty(value = "厂商")
    @ExcelColumn(name="厂商")