合并代码，解决冲突

zhangchao

2024-11-02 c51ab886ca899243f36cffe6c1a86d19057d44f5

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

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