From e932a9b824b93a4a0365e11f1e02775b10c0b045 Mon Sep 17 00:00:00 2001 From: 648540858 <648540858@qq.com> Date: 星期五, 01 三月 2024 10:55:49 +0800 Subject: [PATCH] Merge branch '2.6.9' into wvp-28181-2.0 --- src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java | 4 ++-- 1 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java b/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java index f686019..6591e3f 100755 --- a/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java +++ b/src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java @@ -20,7 +20,7 @@ "(#{app}, #{stream}, #{gbId}, #{name}, " + "#{longitude}, #{latitude}, #{streamType}, " + "#{mediaServerId}, #{createTime})") - @Options(useGeneratedKeys = true, keyProperty = "gbStreamId", keyColumn = "gbStreamId") + @Options(useGeneratedKeys = true, keyProperty = "gbStreamId", keyColumn = "gb_stream_id") int add(GbStream gbStream); @Update("UPDATE wvp_gb_stream " + @@ -158,7 +158,7 @@ " <foreach collection='list' item='item' index='index' separator=';'>"+ "UPDATE wvp_gb_stream " + " SET name=#{item.name},"+ - " gb_id=#{item.gb_id}"+ + " gb_id=#{item.gbId}"+ " WHERE app=#{item.app} and stream=#{item.stream}"+ "</foreach>"+ "</script>") -- Gitblit v1.8.0