Merge branch 'master' into develop-add-api-key

leesam

2024-04-01 23beb4fde063b4a648c2a273f17cf5c423fa0ae6

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

@@ -269,7 +269,7 @@
            "charset,"+
            "ssrc_check,"+
            "as_message_channel,"+
            "broadcastPushAfterAck,"+
            "broadcast_push_after_ack,"+
            "geo_coord_sys,"+
            "on_line,"+
            "media_server_id"+