Merge remote-tracking branch 'origin/master'

lishuai

2023-12-26 70577a6d6cf2bded29e71dcad11a0c2605193d20

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

@@ -88,6 +88,9 @@
    @ApiModelProperty(value = "通道号")
    @ExcelColumn(name="通道号")
    private String channelNo;
    @ApiModelProperty(value = "通道名称集合")
    @ExcelColumn(name="通道名称集合")
    private String channelInfo;

    @ApiModelProperty(value = "设备类型编码")
    @ExcelColumn(name="设备类型编码")