From 10e83311f7457f07b3d0928fba0de6a5622f1748 Mon Sep 17 00:00:00 2001
From: ali <ali9696@163.com>
Date: 星期四, 06 三月 2025 09:57:44 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/develop1.0' into develop_alioo

---
 zhitan-system/src/main/java/com/zhitan/model/mapper/DaqTemplateMapper.java |    3 +++
 1 files changed, 3 insertions(+), 0 deletions(-)

diff --git a/zhitan-system/src/main/java/com/zhitan/model/mapper/DaqTemplateMapper.java b/zhitan-system/src/main/java/com/zhitan/model/mapper/DaqTemplateMapper.java
index 905ad07..d384f9e 100644
--- a/zhitan-system/src/main/java/com/zhitan/model/mapper/DaqTemplateMapper.java
+++ b/zhitan-system/src/main/java/com/zhitan/model/mapper/DaqTemplateMapper.java
@@ -65,6 +65,9 @@
 
     int dapHasExistWhenUpdate(@Param("id") String id, @Param("code") String code, @Param("deviceType") String deviceType);
 
+    int dapCodeHasExist(@Param("kay") String key, @Param("deviceType") String deviceType);
+
+    int dapCodeHasExistWhenUpdate(@Param("id") String id, @Param("key") String code, @Param("deviceType") String deviceType);
     /**
      * 鏌ヨ鎸囨爣妯℃澘淇℃伅
      *

--
Gitblit v1.9.3