Merge remote-tracking branch 'origin/bfasrs6' into bfasrs6

Junjie

2023-05-26 ea5e88b0c6f5be4d0c6637b5e7bba94ee85f9673

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

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