Merge branch 'master' of http://git.2weisou.com/wangxiao/zkPCproject into master

src/views/ReceivingRecords/index.vue

@@ -236,7 +236,7 @@
         </el-table-column>
         <el-table-column prop="markAdvisor" label="标记客户" align="center">
           <template slot-scope="{ row }">
-            {{ row.markAdvisor == 0 ? "已标记" : "未标记" }}
+            {{ row.markAdvisor == 0 ? "未标记" : "已标记" }}
           </template>
         </el-table-column>