From 8c4922cbe14b126c5c04a23b0c1968676e597eb7 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期六, 08 四月 2023 15:29:15 +0800
Subject: [PATCH] Merge branch '2.6.7' into wvp-28181-2.0
---
src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java | 5 +----
1 files changed, 1 insertions(+), 4 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
index 3751a24..fe739ea 100644
--- a/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/DeviceMapper.java
@@ -171,9 +171,6 @@
@Delete("DELETE FROM device WHERE deviceId=#{deviceId}")
int del(String deviceId);
- @Update("UPDATE device SET online=0")
- int outlineForAll();
-
@Select("SELECT " +
"deviceId, " +
"coalesce(custom_name, name) as name, " +
@@ -258,7 +255,7 @@
"<if test=\"mediaServerId != null\">, mediaServerId=#{mediaServerId}</if>" +
"WHERE deviceId=#{deviceId}"+
" </script>"})
- int updateCustom(Device device);
+ void updateCustom(Device device);
@Insert("INSERT INTO device (" +
"deviceId, " +
--
Gitblit v1.8.0