合并代码，解决冲突

zhangchao

2024-11-02 f5b7a2eb5125b17d470c9b8e0b9bb6ac1654dbae

 src/main/webapp/views/resource/resource.html

@@ -257,7 +257,7 @@
                            show: true,
                            indent: 15,
                            strict: false,
                            expandedKeys: true
                            expandedKeys: false
                        }
                    });
                    // 弹窗不出现滚动条