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

This commit is contained in:
zhutianqi
2022-01-06 15:49:40 +08:00
2 changed files with 2 additions and 2 deletions
@@ -267,7 +267,7 @@
custom-class="demo-drawer"
>
<div class="standardForComments">
<div class="content" style="height: 100%;">
<div class="content" style="height: 100%;overflow: auto">
<el-tree
v-if="TXJGmodal"
ref="TXJGTree"
@@ -439,7 +439,7 @@
custom-class="demo-drawer"
>
<div class="standardForComments">
<div class="content" style="height: 100%;">
<div class="content" style="height: 100%;overflow: auto">
<el-tree
v-if="TXJGmodal"
ref="TXJGTree"