Merge remote-tracking branch 'origin/master' into dev-auto-sign

zhengyiming

昨天 1b3d015ebf23534ed2911be8e7ae552793ebfb66

 src/views/CPersonManage/components/StaffResumeView.vue

@@ -44,14 +44,21 @@
    <ProFormCol>
      <ProFormColItem :span="12">
        <ProFormItemV2 label="身高：" prop="height">
          <ProFormInputNumber v-model="detail.height"></ProFormInputNumber>
          <ProFormInputNumber v-model="detail.height" unit="cm"></ProFormInputNumber>
        </ProFormItemV2>
      </ProFormColItem>
    </ProFormCol>
    <ProFormCol>
      <ProFormColItem :span="12">
        <ProFormItemV2 label="体重：" prop="weight">
          <ProFormInputNumber v-model="detail.weight"></ProFormInputNumber>
          <ProFormInputNumber v-model="detail.weight" unit="kg"></ProFormInputNumber>
        </ProFormItemV2>
      </ProFormColItem>
    </ProFormCol>
    <ProFormCol>
      <ProFormColItem :span="12">
        <ProFormItemV2 label="鞋码：" prop="shoeSize">
          <ProFormInputNumber v-model="detail.shoeSize" unit="码"></ProFormInputNumber>
        </ProFormItemV2>
      </ProFormColItem>
    </ProFormCol>
@@ -127,6 +134,7 @@
  workExperience: '',
  height: 0,
  weight: 0,
  shoeSize: 0,
  photos: [] as UploadUserFile[],
  videos: [] as UploadUserFile[],
});
@@ -147,6 +155,7 @@
    detail.workExperience = data.workExperience;
    detail.height = data.height ?? 0;
    detail.weight = data.weight ?? 0;
    detail.shoeSize = data.shoeSize ?? 0;
    detail.photos = data.photos
      ? data.photos.map((x) => convertApi2FormUrl(x))
      : ([] as UploadUserFile[]);