Merge remote-tracking branch 'origin/master'

xiangpei

2024-09-04 ec674d362bf2dba85ba7fdf9c42b73ac62bf3333

 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;

}