Merge remote-tracking branch 'origin/master'

zss

2024-07-26 8d3c3fec23edeabe3b40aa1eefc7fdd0c6c57d57

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

@@ -17,4 +17,6 @@
public interface DataConfigMapper extends BaseMapper<DataConfig> {

    List<DeviceConfigDtoPage> selectDataConfigList(Integer deviceId);

    List<Integer> deleteDataConfig();
}