Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/views/recruit/position/index.vue

@@ -6,8 +6,8 @@
       <div class="stickyBox my-5">
         <headSearch></headSearch>
       </div>
-      <!-- 城市和区域 -->
       <cityFilter class="mx-5 mb-5"></cityFilter>
+      <conditionFilter class="mx-5 mb-5"></conditionFilter>
     </v-card>
     <div>
       <div>
@@ -19,6 +19,7 @@
 </template>
 <script setup>
 import cityFilter from './components/cityFilter'
+import conditionFilter from './components/conditionFilter'
 import headSearch from '@/components/headSearch'
 import { useRoute } from 'vue-router'
 defineOptions({name: 'retrieval-position-page'})