Merge branch 'master' of http://47.118.43.255:3000/jjhc/jucai

public/themes/default/views/app/person/recruit_info.blade.php

@@ -191,7 +191,7 @@
                     <td valign="center" colspan="8" >
                         <el-form-item prop="degree" label="学位" label-width="70px">
                             <el-select v-model="user.degree" placeholder="请选择学位">
-                                <el-option label="" value=""></el-option>
+                                <el-option label="无" value="无">无</el-option>
                                 <el-option label="学士学位" value="学士学位"></el-option>
                                 <el-option label="硕士学位" value="硕士学位"></el-option>
                                 <el-option label="博士学位" value="博士学位"></el-option>

public/themes/default/views/app/recruit/sign_up.blade.php

@@ -666,7 +666,7 @@
                         <td valign="center" colspan="8" >
                             <el-form-item prop="degree" label="学位" label-width="70px">
                                 <el-select v-model="user.degree" placeholder="请选择学位">
-                                    <el-option label="" value=""></el-option>
+                                    <el-option label="无" value="无">无</el-option>
                                     <el-option label="学士学位" value="学士学位"></el-option>
                                     <el-option label="硕士学位" value="硕士学位"></el-option>
                                     <el-option label="博士学位" value="博士学位"></el-option>