Merge branch 'master' into 02/23reviewBUG

dist/static/css/chunk-086ae982.381c30c1.css

@@ -1 +0,0 @@
-.payForm[data-v-3d1ffe73] .el-form-item{min-width:40%}.newBand[data-v-4cd89015]{display:inline-block}.noWrap[data-v-4cd89015]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}

dist/static/css/chunk-c3bc1be6.b1cf227a.css

@@ -0,0 +1 @@
+.payForm[data-v-3d1ffe73] .el-form-item{min-width:40%}.newBand[data-v-b589b966]{display:inline-block}.noWrap[data-v-b589b966]{white-space:nowrap;overflow:hidden;text-overflow:ellipsis}

src/views/businessManager/orderManager/payRecord.vue

@@ -217,12 +217,12 @@
           </el-table-column>
           <el-table-column align="center" label="费用类型">
             <template slot-scope="scope">{{
-              scope.row.type | feeType
+              scope.row.feeProject | feeProject 
             }}</template>
           </el-table-column>
           <el-table-column align="center" label="费用项目">
             <template slot-scope="scope">{{
-              scope.row.feeProject | feeProject
+              scope.row.type | feeType
             }}</template>
           </el-table-column>
           <el-table-column