Merge branch 'blockingData' into dev

src/views/system/user/components/UserInfoEdit.vue

@@ -103,12 +103,12 @@
           <el-col :span="12">
             <el-form-item label="是否参加考核" prop="takeAssessment">
               <el-radio-group v-model="form.takeAssessment">
-                <el-radio :value="'1'">是</el-radio>
-                <el-radio :value="'0'">否</el-radio>
+                <el-radio :value="'Y'">是</el-radio>
+                <el-radio :value="'N'">否</el-radio>
               </el-radio-group>
             </el-form-item>
           </el-col>
-          <el-col :span="24" v-if="form.takeAssessment === '0'">
+          <el-col :span="24" v-if="form.takeAssessment === 'N'">
             <el-row :gutter="16">
               <el-col :span="12">
                 <el-form-item label="免考核开始时间" prop="exemptTakeAssessmentStartTime">