Merge remote-tracking branch 'origin/master'

Administrator

2023-08-07 c1dafc830993fcedb99a4f2b62178691e1e92e64

 ard-work/src/main/resources/templates/test.html

@@ -782,7 +782,7 @@
            } else if (camera.type == "dh") {
                realViewDh("127.0.0.1", ID, camera.username, camera.password, camera.ipaddr, camera.port);
            } else {
                realViewHik("192.168.1.15", ID, camera.username, camera.password, camera.ipaddr, camera.port);
                realViewHik("127.0.0.1", ID, camera.username, camera.password, camera.ipaddr, camera.port);
            }
        }
    });