Merge branch 'phyzasrs-erp' into phyzasrs-erp-4

zhangc

2024-12-23 dcc9b7294a7f47c00445d2b8dec0097b6b3b0e5e

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

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