[viewer]解决合并冲突

Jin Lei

2023-11-11 076cd08a4abcae33957e4de5b15babfcb6fed8ce

 static/layers.json

@@ -3130,6 +3130,10 @@
            "name": "行政审批局",
            "children": [
                {
                    "id": "B5610EB3",
                    "name": "视频监控",
                    "children": [
                        {
                    "id": "zhianjiankong",
                    "sourceType": "cluster",
                    "alpha": 1,
@@ -3468,7 +3472,15 @@
                        "360.0",
                        "-49.3"
                    ]
                        }
                    ],
                    "rename": false,
                    "expanded": false
                },
                {
                    "id": "2BA3A978",
                    "name": "城市窨井",
                    "children": [
                {
                    "id": "雨水井",
                    "sourceType": "cluster",
@@ -3687,7 +3699,11 @@
                }
            ],
            "rename": false,
            "expanded": false,
                    "expanded": false
                }
            ],
            "rename": false,
            "expanded": true,
            "checked": false
        },
        {