Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-03 c7f492c5accca21bdf149148a5be6503552139f1

 ycl-pojo/src/main/java/com/ycl/platform/domain/entity/DeviceInfo.java

@@ -22,9 +22,9 @@
    /** 设备编号/国标码 */
    private String deviceId;

    @TableField("channel_id")
    /** 设备通道ID */
    private String channelId;
    @TableField("device_name")
    /** deviceName */
    private String deviceName;


}