Merge remote-tracking branch 'origin/pet' into pet

# Conflicts:
#	src/views/corpInfo/user/components/edit.vue

src/views/corpInfo/user/components/edit.vue

@@ -139,11 +139,11 @@
                     <i class="el-icon-plus"/>
                   </el-upload>
                   <div style="margin-left:20px;line-height:1.6">
-                    <!-- <div style="color: red;font-size: 12px">（若新上传人脸图片将覆盖旧人脸信息，不上传则不做修改）</div>
+                    <div style="color: red;font-size: 12px">（若新上传人脸图片将覆盖旧人脸信息，不上传则不做修改）</div>
                     <div style="color: red;font-size: 12px">* 图像格式：JPEG、JPG、PNG、BMP</div>
                     <div style="color: red;font-size: 12px">* 图像大小：不超过1M。</div>
-                    <div style="color: red;font-size: 12px">* 图像分辨率：大于32×32像素，小于4096×4096像素，<br>人脸占比不低于64×64像素。</div> -->
+                    <div style="color: red;font-size: 12px">* 图像分辨率：大于32×32像素，小于4096×4096像素，<br>人脸占比不低于64×64像素。</div>
-                    <!-- <div style="color: red;font-size: 12px">（如无合适照片请该人员登陆曹港APP中进行人脸照片采集）</div> -->
+                    <div style="color: red;font-size: 12px">（如无合适照片请该人员登陆曹港APP中进行人脸照片采集）</div>
                   </div>
                 </div>
               </el-form-item>
@@ -812,7 +812,7 @@ export default {
         DUTIES_ID: [{ required: true, message: '请选择岗位', trigger: 'change' }],
         SORT: [{ required: true, message: '请输入排序', trigger: 'blur' }],
         NATION: [{ required: false, trigger: 'blur' }],
-        SEX: [{ required: false, trigger: 'blur' }],
+        SEX: [{ required: false, trigger: 'blur' }], // / dsfsdfsd
         POLITICAL_OUTLOOK: [{ required: true, message: '政治面貌不能为空', trigger: 'blur' }],
         DATE_OF_BIRTH: [{ required: true, message: '请选择出生年月', trigger: 'blur' }],
         DEGREE_OF_EDUCATION: [{ required: true, message: '文化程度不能为空', trigger: 'blur' }],