Merge remote-tracking branch 'origin/master'

fuliqi

2024-08-31 6221c8b5df5eb0ee62dce79048c9c3f0dc3d0fc1

 ycl-pojo/src/main/java/com/ycl/platform/domain/vo/TMonitorVO.java

@@ -267,4 +267,10 @@
     * 动态列
     */
    private List<DynamicColumnVO> dynamicColumnList;

    /**
     * 设备厂商： 0海康  1大华  2宇视
     */
    private Integer deviceType;

}