Merge remote-tracking branch 'origin/master'

zss

2024-08-03 f608e00e49461f60ba8df1566fc4b9a998430ace

 cnas-server/src/main/java/com/yuanchu/mom/mapper/DataConfigMapper.java

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

    List<DeviceConfigDtoPage> selectDataConfigList(Integer deviceId);

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