Merge branch 'master' of http://git.xt.wenhq.top:8083/liwei19941102/cbwqpf

* 'master' of http://git.xt.wenhq.top:8083/liwei19941102/cbwqpf:
  修改名称

ruoyi-ui/src/views/components/table/xtTable.vue

@@ -60,7 +60,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="3">
-          <el-select v-model="queryParams.type" clearable placeholder="请选择">
+          <el-select v-model="queryParams.shipRegionType" clearable placeholder="请选择">
             <el-option
               v-for="item in typeOptions"
               :key="item.value"