Merge remote-tracking branch 'origin/master'

zss

2024-07-30 4d9364da736f322cfeeec2815e83f2a3f6534223

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