Merge branch 'phyzwms2' into phyzasrs-erp

zhangchao

2024-11-08 07fc18f77a9764bd47857e30d65abc03cc1e439c

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

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