Merge branch 'dev-行程上报1031' into dev

src/views/modules/base/epidemic/travelForm.vue

@@ -148,7 +148,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item v-if="formData.trafficType==='4'"
+        <el-form-item v-if="formData.trafficType==='5'"
                       label="其他"
                       prop="trafficTypeExplain"
                       style="display: block"

src/views/modules/visual/communityGovern/zhongdianxingcheng/detail.vue

@@ -7,11 +7,11 @@
           <span>详情</span>
         </div>
 
-        <div class="div_tuomin">
+        <!-- <div class="div_tuomin">
           <el-button size="mini"
                      class="diy-button--search"
                      @click="handleTuomin">显示脱敏信息</el-button>
-        </div>
+        </div> -->
 
         <div class="btn-close"
              @click="handleClose">