From bf233b9eeb959091831bf0b9a11a180fee2b2d51 Mon Sep 17 00:00:00 2001
From: Crunchy <3114200645@qq.com>
Date: 星期五, 09 八月 2024 18:44:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
cnas-server/src/main/java/com/yuanchu/mom/mapper/DataConfigMapper.java | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DataConfigMapper.java b/cnas-server/src/main/java/com/yuanchu/mom/mapper/DataConfigMapper.java
index 56572b2..1e0768f 100644
--- a/cnas-server/src/main/java/com/yuanchu/mom/mapper/DataConfigMapper.java
+++ b/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();
}
--
Gitblit v1.9.3