Merge remote-tracking branch 'origin/master'

zss

2024-07-31 9895be644e5f4d8b03170fcdfedb9fc57d90f2d8

 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();
}