Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-31 6221c8b5df5eb0ee62dce79048c9c3f0dc3d0fc1

 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;


}