Merge branch 'feature/act-code' into dev

src/views/salesleads/actCodeManage/staffActCode/views/act-code-table.vue

@@ -81,14 +81,14 @@
           <p class="toTopTip" v-if="row.overFlag == 1">(今日已达上限)</p>
         </template>
       </el-table-column>
-      <el-table-column label="添加好友人数" prop="addNum" sortable="custom" width="150">
+      <el-table-column label="添加好友人数" prop="addNumT" sortable="custom" width="150">
         <template slot-scope="{ row }">
-          <p>{{ row.addNum ? row.addNum : '--' }}</p>
+          <p>{{ row.addNumT ? row.addNumT : '--' }}</p>
         </template>
       </el-table-column>
-      <el-table-column label="今日新增人数" prop="addNumT" sortable="custom" width="150">
+      <el-table-column label="今日新增人数" prop="addNum" sortable="custom" width="150">
         <template slot-scope="{ row }">
-          <p>{{ row.addNumT ? row.addNumT : '--' }}</p>
+          <p>{{ row.addNum ? row.addNum : '--' }}</p>
         </template>
       </el-table-column>
       <el-table-column label="关联导购" width="130" show-overflow-tooltip>