Merge remote-tracking branch 'origin/master'

odc.xiaohui

2023-05-24 49be3d0b1921172dcbf5aa59749243b9af8a8773

Merge remote-tracking branch 'origin/master'

 src/views/cause/Entry.vue

@@ -274,7 +274,7 @@
            </el-table-column>
            <el-table-column label="操作">
              <template slot-scope="scope">
                <el-button type="text" size="medium" @click="updataReport(scope.row)">编辑</el-button>
<!--                <el-button type="text" size="medium" @click="updataReport(scope.row)">编辑</el-button>-->
<!--                <el-button type="text" size="medium"-->
<!--                  @click="leaveReport(scope.row.id, scope.row.causeId, scope.row.groupId)" style="color:#ff0000"-->
<!--                  :disabled="scope.row.isInGroup == 0">退群 </el-button>-->