Merge branch 'dev-caiji' into test

src/views/modules/base/collect.vue

@@ -83,7 +83,7 @@
           <template slot-scope="scope">
             <span v-if="scope.row.ymjz == 1">全程接种</span>
             <span v-if="scope.row.ymjz == 2">未全程接种</span>
-            <span v-if="scope.row.ymjz == 3">未接种</span>
+            <span v-if="scope.row.ymjz == 0">未接种</span>
           </template>
         </el-table-column>
         <!-- <el-table-column prop="organizationCreatedTime" align="center" label="创建时间"> -->