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

This commit is contained in:
fanlin
2021-07-28 16:12:23 +08:00
@@ -64,6 +64,9 @@
fixed="left"
width="260px"
>
<template slot-scope="scope">
<span style="margin-left: 10px">{{ scope.row.standSort+ ' ' + scope.row.standNumber + '-' + scope.row.standYear}}</span>
</template>
</el-table-column>
<el-table-column
prop="standName"