Merge branch 'master' into dev/数据库统合

2024-12-27 15:31:27 +08:00
parent a5f1422466 dea05b46d3
commit 7751eae913
2 changed files with 3 additions and 3 deletions
--- a/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
+++ b/src/main/java/com/genersoft/iot/vmp/gb28181/dao/CommonGBChannelMapper.java
@@ -152,7 +152,7 @@ public interface CommonGBChannelMapper {
            " SET gb_status = #{status}" +
            " WHERE id = #{gbId}"+
            " </script>"})
-    int updateStatusById(@Param("gbId") int gbId, @Param("status") int status);
+    int updateStatusById(@Param("gbId") int gbId, @Param("status") String status);

    @Update("<script> " +
            "<foreach collection='commonGBChannels' index='index' item='item' separator=';'> " +