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

This commit is contained in:
yanyizhou
2021-09-14 15:22:35 +08:00
@@ -128,7 +128,7 @@
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'b9abd00768c8ed97be89547c2da3f0eb'">查看</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '强制撤回']">强制撤回</el-dropdown-item>
<el-dropdown-item :command="[scope.row, '强制撤回']">撤回</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>