Merge branch '2.6.9' into wvp-28181-2.0

src/main/java/com/genersoft/iot/vmp/storager/dao/GbStreamMapper.java

@@ -158,7 +158,7 @@ public interface GbStreamMapper {
                 " <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>")