Merge remote-tracking branch 'origin/master'

lishuai

2023-12-15 eb53aef53bdab3eb452b95276b575bb45e616316

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

@@ -52,8 +52,8 @@
    @ExcelColumn(name="备注")
    private String remark;

    @ApiModelProperty(value = "设别名")
    @ExcelColumn(name="设别名")
    @ApiModelProperty(value = "设备名称")
    @ExcelColumn(name="设备名称")
    private String name;

    @ApiModelProperty(value = "海康标识", example = "1")