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

# Conflicts:
#	src/pages/regulatoryRepository/nonConfomity/pages/rectificationDatabase.vue
This commit is contained in:
Mr.Z
2021-08-04 14:41:35 +08:00
@@ -203,7 +203,7 @@
<el-dropdown trigger="click" @command="handleCommand">
<i class="iconfont">&#xe61e;</i>
<el-dropdown-menu slot="dropdown">
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'374cb5206597fa201e57f561ff2f8ed7'">查看123 </el-dropdown-item>
<el-dropdown-item :command="[scope.row, '查看']" v-btn-permission="'374cb5206597fa201e57f561ff2f8ed7'">查看</el-dropdown-item>
</el-dropdown-menu>
</el-dropdown>
</div>