Merge remote-tracking branch 'origin/master'

CZT

2023-10-24 f27f3ea5055888f7f1c797d0fd7fb26a2013c89c

 igds-web/src/main/resources/static/admin/n2/n2-hand-5013.js

@@ -298,7 +298,7 @@
        layer.open({
            type: 1,
            title: '设备操作-' + domSelectDevice.attr("name"),
            area: ['450px', '200px'],
            area: ['450px', '150px'],
            shade: 0,
            content: $('#control-HL2'),
            btn: 0,