diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4cb195d2..83b2f8fd 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -3,11 +3,8 @@
   <component name="ChangeListManager">
     <list default="true" id="e4baaf01-a2c2-445d-98a1-9f4c50c148cf" name="Default Changelist" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logback/api-all.log" beforeDir="false" afterPath="$PROJECT_DIR$/logback/api-all.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logback/api-error.log" beforeDir="false" afterPath="$PROJECT_DIR$/logback/api-error.log" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/logback/api-info.log" beforeDir="false" afterPath="$PROJECT_DIR$/logback/api-info.log" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/src/main/java/com/lz/common/utils/ExcelUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/java/com/lz/common/utils/ExcelUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffProjectExperienceDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffProjectExperienceDao.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffOccupationDao.xml" beforeDir="false" afterPath="$PROJECT_DIR$/src/main/resources/mapper/generator/StaffOccupationDao.xml" afterDir="false" />
     </list>
     <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
     <option name="SHOW_DIALOG" value="false" />
@@ -178,7 +175,7 @@
       <workItem from="1590038091791" duration="38394000" />
       <workItem from="1590136970394" duration="34977000" />
       <workItem from="1590560185803" duration="9619000" />
-      <workItem from="1590633459230" duration="32009000" />
+      <workItem from="1590633459230" duration="33565000" />
     </task>
     <servers />
   </component>
diff --git a/src/main/java/com/lz/common/utils/ExcelUtil.java b/src/main/java/com/lz/common/utils/ExcelUtil.java
index 1660d68a..87c90ec4 100644
--- a/src/main/java/com/lz/common/utils/ExcelUtil.java
+++ b/src/main/java/com/lz/common/utils/ExcelUtil.java
@@ -667,7 +667,7 @@ public class ExcelUtil {
                     break;
                 case NUMERIC:
                     //System.out.println("    "+cell.getCellStyle().getDataFormatString()+"   ");
-                    if ("yyyy/m/d;@".equals(cell.getCellStyle().getDataFormatString()) || "yyyy\\-mm\\-dd".equals(cell.getCellStyle().getDataFormatString()) || "yyyymmdd".equals(cell.getCellStyle().getDataFormatString())) {
+                    if ("yyyy/m/d;@".equals(cell.getCellStyle().getDataFormatString()) || "yyyy\\-mm\\-dd".equals(cell.getCellStyle().getDataFormatString()) || "yyyymmdd".equals(cell.getCellStyle().getDataFormatString()) || "yyyymm".equals(cell.getCellStyle().getDataFormatString())) {
                         value = DateUtils.format(cell.getDateCellValue());
                     } else {
                         DecimalFormat df = new DecimalFormat("#");
diff --git a/src/main/resources/mapper/generator/StaffEducationDao.xml b/src/main/resources/mapper/generator/StaffEducationDao.xml
index 5c6d982d..7d67bf62 100644
--- a/src/main/resources/mapper/generator/StaffEducationDao.xml
+++ b/src/main/resources/mapper/generator/StaffEducationDao.xml
@@ -17,7 +17,7 @@
     </resultMap>
 
     <select id="getInfoByStaffId" resultType="com.lz.modules.app.dto.StaffEducationInfoDto">
-        select education,graduated_school,specialty,graduation_time from lz_staff_education where is_delete=0 and staff_id=#{staffId}
+        select education,graduated_school,specialty,DATE_FORMAT(graduation_time,'%Y-%m-%d') graduation_time from lz_staff_education where is_delete=0 and staff_id=#{staffId}
     </select>
 
 
diff --git a/src/main/resources/mapper/generator/StaffOccupationDao.xml b/src/main/resources/mapper/generator/StaffOccupationDao.xml
index c7ec0ab5..95ed190c 100644
--- a/src/main/resources/mapper/generator/StaffOccupationDao.xml
+++ b/src/main/resources/mapper/generator/StaffOccupationDao.xml
@@ -33,9 +33,9 @@
     </select>
 
     <select id="getOccupationByStaffId" resultType="com.lz.modules.app.dto.StaffOccupationInfoDto">
-    select employee_no staff_no,position,entry_time,staff_status,resignation_time,resignation_reasons,
+    select employee_no staff_no,position,entry_time,staff_status,DATE_FORMAT(resignation_time,'%Y-%m-%d') resignation_time,resignation_reasons,
     concat(floor(TIMESTAMPDIFF(day,entry_time,DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%S'))/360),'年',TIMESTAMPDIFF(day,entry_time,DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%S')) mod 360 div 30,'个月',TIMESTAMPDIFF(day,entry_time,DATE_FORMAT(NOW(), '%Y-%m-%d %H:%i:%S')) mod 360 mod 30,'天') company_seniority,
-    signing_company,job_begin_time,work_experience,resume_url
+    signing_company,DATE_FORMAT(job_begin_time,'%Y-%m-%d') job_begin_time,work_experience,resume_url
     from lz_staff_occupation where is_delete=0 and staff_id=#{staffId}
     </select>
 
diff --git a/src/main/resources/mapper/generator/StaffProjectExperienceDao.xml b/src/main/resources/mapper/generator/StaffProjectExperienceDao.xml
index 654f2d93..90c94bd9 100644
--- a/src/main/resources/mapper/generator/StaffProjectExperienceDao.xml
+++ b/src/main/resources/mapper/generator/StaffProjectExperienceDao.xml
@@ -17,7 +17,7 @@
     </resultMap>
 
     <select id="getProjectInfoByStaffId" resultType="com.lz.modules.app.dto.StaffProjectExperienceDto">
-        SELECT project_name,project_begin_time,if(project_end_time is null,'至今',project_end_time) project_end_time,project_content from lz_staff_project_experience where is_delete=0 and staff_id=#{staffId}
+        SELECT project_name,DATE_FORMAT(project_begin_time,'%Y-%m-%d') project_begin_time,if(DATE_FORMAT(project_begin_time,'%Y-%m-%d') is null,'至今',DATE_FORMAT(project_begin_time,'%Y-%m-%d')) project_end_time,project_content from lz_staff_project_experience where is_delete=0 and staff_id=#{staffId}
     </select>
 
 
diff --git a/src/main/resources/mapper/generator/StaffWorkTransferRecordDao.xml b/src/main/resources/mapper/generator/StaffWorkTransferRecordDao.xml
index c4cf4069..452d4e0f 100644
--- a/src/main/resources/mapper/generator/StaffWorkTransferRecordDao.xml
+++ b/src/main/resources/mapper/generator/StaffWorkTransferRecordDao.xml
@@ -15,7 +15,7 @@
         <result property="transferType" column="transfer_type"/>
     </resultMap>
     <select id="getWorkInfoByStaffId" resultType="com.lz.modules.app.dto.StaffWorkTransferDto">
-        select transfer_time,transfer_record,transfer_type from lz_staff_work_transfer_record where is_delete=0 and staff_id=#{staffId}
+        select DATE_FORMAT(transfer_time,'%Y-%m-%d') transfer_time,transfer_record,transfer_type from lz_staff_work_transfer_record where is_delete=0 and staff_id=#{staffId}
     </select>