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

zss

2025-04-18 ec1f20c31d64ddbc5242c3942902bc5233a8a140

 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;

}