Merge branch 'master' of http://git.cc-lotus.info/smart-jobs/web-student

src/views/want/info/context/jobinfo.vue

@@ -10,7 +10,6 @@
               <el-option label="全职" :value="0"></el-option>
               <el-option label="实习" :value="1"></el-option>
             </el-select>
-            <!-- <el-date-picker v-model="value1" type="daterange" range-separator="至" start-placeholder="开始日期" end-placeholder="结束日期"> </el-date-picker> -->
           </el-col>
           <el-col :span="4" class="search_center">企业名称:</el-col>
           <el-col :span="8" class="search_center">