Merge branch 'dev' of https://git.citupro.com/zhengnaiwen_citu/menduner into dev

src/utils/date.js

@@ -1,6 +1,5 @@
 // 时间戳转换为年月日时分秒
 export const timesTampChange = (timestamp, format = 'Y-M-D h:m:s') => {
-  // if (timestamp === null) return '至今'
   if (!timestamp) return ''
   const date = new Date(timestamp)
   const Y = date.getFullYear().toString()

src/views/recruit/personal/remuse/components/workExperience.vue

@@ -138,8 +138,7 @@ const formItems = ref({
       value: null,
       label: '结束时间 *',
       col: 6,
-      // default: true, // 日期组件有showSoFar要给default: true不然给null会默认勾选上至今
-      // showSoFar: true,
+      showSoFar: true,
       outlined: true,
       clearable: true,
       rules: [v => !!v || '请选择结束时间']