Merge branch 'blueBranch' into allTestUrgent

src/HDrpManagement/collectionRule/modules/table.vue

@@ -214,6 +214,7 @@
       <el-table-column
        prop="a"
        :label="$t('操作')"
+       fixed="right"
        width="100px">
        <template slot-scope="scope">
 <!--         <el-button type="text" size="mini" @click="goDetail(scope.row)">{{$t('详 情')}}</el-button>-->