Merge remote-tracking branch 'origin/master'

zss

2024-07-31 df40860e183704a18d9b4a5d04931c86f6fe3dd7

 cnas-server/src/main/java/com/yuanchu/mom/service/DataConfigService.java

@@ -18,5 +18,5 @@

    List<DeviceConfigDtoPage> selectDataConfigList(Integer deviceId);

    List<DataConfig> deleteDataConfig();
    void deleteDataConfig();
}