Преглед изворни кода

Merge branch 'dev' of http://39.101.143.165:8090/dong_k/tenant-Platform into dev

@dongkboy пре 3 месеци
родитељ
комит
fdedb9b584
1 измењених фајлова са 4 додато и 0 уклоњено
  1. 4 0
      src/views/receivable/handingFee/index.vue

+ 4 - 0
src/views/receivable/handingFee/index.vue

@@ -178,6 +178,10 @@
           <el-table-column prop="jqSuperviseCostsPremiums" label="交强手续费" width="100"></el-table-column>
           <el-table-column prop="syPremium" label="商业险保费" width="100"></el-table-column>
           <el-table-column prop="sySuperviseCostsProportion" label="商业险手续费比例" width="100"></el-table-column>
+<<<<<<< HEAD
+=======
+          <el-table-column prop="jqSuperviseCostsPremiums" label="交强手续费" width="100"></el-table-column>
+>>>>>>> a92e24f70d7442d0048eec7bee96414ebc00fcde
           <el-table-column prop="sySuperviseCostsPremiums" label="商业手续费" width="100"></el-table-column>
           <el-table-column prop="otherCostsPremiums" label="跟单金额" width="100"></el-table-column>
           <el-table-column prop="jqPolicyNo" label="交强险保单号" width="150"></el-table-column>