Merge remote-tracking branch 'origin/dev_ztns' into dev_ztns

zouyu

2026-01-14 d2f503f72b5485bfee54ea296c7d0a9a243cea02

 cnas-device/src/main/java/com/ruoyi/device/pojo/DataConfig.java

@@ -77,4 +77,7 @@
    @TableField(select = false, exist = false)
    private Boolean isDevice;

    @TableField(select = false, exist = false)
    private String sample;

}