diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values
index bb57555..4eba079 100644
Binary files a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values and b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values differ
diff --git a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s
index cc22fb7..9a75233 100644
--- a/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s
+++ b/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s
@@ -1 +1 @@
-‡
�~��
�|�}�}�}�y�{�~�{�|�x�}�|�{�{�}�
�W�\�X�\�U�X�R�X�Z�[�Z�T�V�Q�Y�Y�[�Z�U�Z�V�X�P�U�S�]�\�V�d�e�b�^�U�\�V�V�Q�[�U�W�_��
�x�x�y�u�|�{�{�w�y�{�{�x�{�y�x�w�v�W�X�\�X�V�Y�[�[�]�[�[�n�l�t�o�n�o�s�s�w�p�n�t�o�p�k�q�q�o�t�l�z�r�v�t�u�t�v�t�xԋ
��
ݏ
‘
̏

ώ
ގ
�
��
�
ɐ
ː
�
Џ
ێ
�
׎
�
ː
��
Ð
��
Ȑ
��
��
�
Ґ
Ə
ώ
ܓ
֐
�
�
�
͓
��
�
ё
؏
ʌ
��
ˑ
ΐ
ڎ
ɔ
�
ώ
�
ב
Ó
ݎ
ݏ
ϐ
ڍ
�
��
�
��
�
ܑ
ʎ
ٓ
ǒ
�
Ɛ
�
��
�
ݐ
͓
Ò
��
��
�
Œ
͏
��
�
�
ϐ
֒
�
�
��
Ӑ
��
ڏ
ޏ
ђ
�
đ
�
��
�
ێ
Ԓ
�
ߎ
�
�
�
ߒ
��
�x�s�x�x�x�u�x�v�w�y�y�w�x�v�v�v�v�u�w�{�m�n�l�i�i�h�l�f�k�i�h�l�k�j�k�t�~�|�~�~�}�{�}�}���}���|�~��~�}��}�~��~�|�~��~�~�}��{
\ No newline at end of file
+‡
�~��
�|�}�}�}�y�{�~�{�|�x�}�|�{�{�}�
�W�\�X�\�U�X�R�X�Z�[�Z�T�V�Q�Y�Y�[�Z�U�Z�V�X�P�U�S�]�\�V�d�e�b�^�U�\�V�V�Q�[�U�W�_��
�x�x�y�u�|�{�{�w�y�{�{�x�{�y�x�w�v�W�X�\�X�V�Y�[�[�]�[�[�n�l�t�o�n�o�s�s�w�p�n�t�o�p�k�q�q�o�t�l�z�r�v�t�u�t�v�t�xԋ
��
ݏ
‘
̏

ώ
ގ
�
��
�
ɐ
ː
�
Џ
ێ
�
׎
�
ː
��
Ð
��
Ȑ
��
��
�
Ґ
Ə
ώ
ܓ
֐
�
�
�
͓
��
�
ё
؏
ʌ
��
ˑ
ΐ
ڎ
ɔ
�
ώ
�
ב
Ó
ݎ
ݏ
ϐ
ڍ
�
��
�
��
�
ܑ
ʎ
ٓ
ǒ
�
Ɛ
�
��
�
ݐ
͓
Ò
��
��
�
Œ
͏
��
�
�
ϐ
֒
�
�
��
Ӑ
��
ڏ
ޏ
ђ
�
đ
�
��
�
ێ
Ԓ
�
ߎ
�
�
�
ߒ
��
�x�s�x�x�x�u�x�v�w�y�y�w�x�v�v�v�v�u�w�{�m�n�l�i�i�h�l�f�k�i�h�l�k�j�k�t�~�|�~�~�}�{�}�}���}���|�~��~�}��}�~��~�|�~��~�~�}��{��N�M�M�M�M�M�M�M�M�N�M�M�M�L�L�L�L�M�M�M�J�K�K�K�K�K�K�K�K�K�K�J�J�J�K�K�K�K�K�K�K�L�K�K�K�K�K�J�J�J�K�K�L�K�K�K�K�K�K�K�K�K�J�J�I�J�K�K�K�K�K�K�K�L�K�K�K�K�J�J�J�K�K�K�L�K�K�K�K�K�K�K�K�K�J�J�J�K�K�K�K�K�K�K�K�L�K�K�K�K
\ No newline at end of file
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9c5bc96..02bb468 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -10,129 +10,13 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="baeb3dfb-5097-46c5-933e-6d1dab18b815" name="Changes" comment="">
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/action/MakeUpClockImportAction.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/action/MakeUpClockInAction.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.java" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/workflow/request/hrmattendance/HrmCustomCard_e9.jsp" afterDir="false" />
-      <change afterPath="$PROJECT_DIR$/workflow/request/hrmattendance/HrmEliminationsEvection_e9.jsp" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.at" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat.values.s" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/dataSources/ade958e9-d72b-48ba-8be1-0441de7da9a5/entities/entities.dat_i" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/out/artifacts/hrm_attendance/hrm-attendance.jar" beforeDir="false" afterPath="$PROJECT_DIR$/out/artifacts/hrm_attendance/hrm-attendance.jar" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/MakeUpClockInService.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/MakeUpClockInService.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/BusinessTripsApplyServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/MakeUpClockInServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/MakeUpClockInServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/workflow/web/MakeUpClockInAction.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/web/MakeUpClockInAction.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/common/util/CommonUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/util/CommonUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/src/com/engine/common/util/DateUtil.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/common/util/DateUtil.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/api/kq/browser/service/impl/jucailin/KQCycleSetBrowserService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/api/kq/jucailin/KQCalendarSettingActionApi.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/api/kq/jucailin/KQCommonActionApi.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/api/kq/jucailin/KQCycleSettingActionApi.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/api/kq/jucailin/KQPersonGroupActionApi.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/component/persongroup/service/impl/PersonGroupServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/service/impl/ProcessSubmitCheckServiceImpl.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/cmd/GetPersonDateBySuitOrganzation.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/CommonUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/CommonUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/DateUtil.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/DateUtil.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/DbTools.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/DbTools.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/common/util/Utils.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/common/util/Utils.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/bean/KQHolidaySetWithCalendarSet.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/bean/KQHolidaySetWithCalendarSetBiz.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/bean/KQHolidaySetWithCalendarSetComInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingFormCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingListCmd$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/GetCalendarSettingListCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/AddHolidaySetWithCalendarSetCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/DeleteHolidaySetWithCalendarSetCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/EditHolidaySetWithCalendarSetCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetCalendarSettingTreeCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidayCountWithCalendarSetCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidaySetCalendarWithCalendarSetCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetHolidaySetFormWithCalendarSetCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetImportFormWithCalendarSetCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetRightMenuWithCalendarSetCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetSearchListWithCalendarSetCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/GetSyncFormWithCalendarSetCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/HasRepeatDataWithCalendarSetCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/InitHolidaySetWithCalendarSetCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/SaveImportWithCalendarSetCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/calendar/holidaySet/SyncHolidaySetWithCalendarSetCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/common/DeleteDataCommonCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/common/InsertDataCommonCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/common/QueryDataCommonCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/common/UpdateDataCommonCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleFormCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleListCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSearchConditionCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingFormCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingListCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycleSettingTreeCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailFormCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/cycle/GetCycledetailListCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailFormCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd$3.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupDetailListCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupFormCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupListCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetPersonGroupSearchConditionCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetSuitOrganzationFormCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/GetSuitOrganzationListCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/cmd/personGroup/SaveSuitOrganzationCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/enums/FieldHtmlTypeEnum.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/exception/AttendanceRunTimeException.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/exception/ExceptionUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/genid/DefaultWorker.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/genid/IdGenerator.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/genid/SnowflakeId.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/genid/Worker.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/KQCalendarSettingService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/KQCommonService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/KQCycleSettingService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/KQPersonGroupService.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/impl/KQCalendarSettingServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/impl/KQCommonServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/impl/KQCycleSettingServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/service/impl/KQPersonGroupServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil$2.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil$3.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/CommonUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/Constant$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/Constant.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/DateUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/DbTools.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/ImportProcessWithCalendarSetUtil$1.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/ImportProcessWithCalendarSetUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/KQDateUtil.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/ListConversionMethod.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/PageUidFactory.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/util/ResponseResult.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQCalendarSettingAction.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQCommonAction.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQCycleSettingAction.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/jucailin/web/KQPersonGroupAction.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/kq/biz/KQLeaveRulesComInfo.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/kq/jucailin/cmd/calendar/holidaySet/DeleteHolidaySetWithCalendarSetCmd.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/kq/service/impl/KQHolidaySetServiceImpl.class" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/TestObj.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestObj.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/target/test-classes/TestOneTimePayMentWay.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/test-classes/TestOneTimePayMentWay.class" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/TestObj.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/TestObj.java" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/test/TestOneTimePayMentWay.java" beforeDir="false" afterPath="$PROJECT_DIR$/test/TestOneTimePayMentWay.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/src/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.java" beforeDir="false" afterPath="$PROJECT_DIR$/src/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/action/RevokeLeaveAction.class" beforeDir="false" afterPath="$PROJECT_DIR$/target/classes/com/engine/attendance/workflow/action/RevokeLeaveAction.class" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/workflow/request/hrmattendance/HrmEliminationsEvection_e9.jsp" beforeDir="false" afterPath="$PROJECT_DIR$/workflow/request/hrmattendance/HrmEliminationsEvection_e9.jsp" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -592,7 +476,7 @@
       <workItem from="1710830340596" duration="22134000" />
       <workItem from="1710897421350" duration="5656000" />
       <workItem from="1710912514427" duration="11596000" />
-      <workItem from="1710984188934" duration="14595000" />
+      <workItem from="1710984188934" duration="18401000" />
     </task>
     <servers />
   </component>
diff --git a/out/artifacts/hrm_attendance/hrm-attendance.jar b/out/artifacts/hrm_attendance/hrm-attendance.jar
index 626de52..7b550fc 100644
Binary files a/out/artifacts/hrm_attendance/hrm-attendance.jar and b/out/artifacts/hrm_attendance/hrm-attendance.jar differ
diff --git a/src/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.java b/src/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.java
index ca7dbec..0b0b3a9 100644
--- a/src/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.java
+++ b/src/com/engine/attendance/workflow/cmd/GetKqCycleTimeIntervalCmd.java
@@ -11,10 +11,7 @@ import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 import lombok.extern.slf4j.Slf4j;
 import weaver.general.Util;
-import weaver.hrm.User;
 import weaver.hrm.company.DepartmentComInfo;
-import weaver.hrm.company.SubCompanyComInfo;
-
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.Map;
diff --git a/target/classes/com/engine/attendance/workflow/action/RevokeLeaveAction.class b/target/classes/com/engine/attendance/workflow/action/RevokeLeaveAction.class
index 271dc7e..43d1565 100644
Binary files a/target/classes/com/engine/attendance/workflow/action/RevokeLeaveAction.class and b/target/classes/com/engine/attendance/workflow/action/RevokeLeaveAction.class differ
diff --git a/workflow/request/hrmattendance/HrmEliminationsEvection_e9.jsp b/workflow/request/hrmattendance/HrmEliminationsEvection_e9.jsp
index 1497d57..a11e970 100644
--- a/workflow/request/hrmattendance/HrmEliminationsEvection_e9.jsp
+++ b/workflow/request/hrmattendance/HrmEliminationsEvection_e9.jsp
@@ -119,6 +119,8 @@
                       obj[WfForm.convertFieldNameToId("qt", "detail_1")] = {value:item.qtcc};
                       //半天
                       obj[WfForm.convertFieldNameToId("bt", "detail_1")] = {value:item.btcc};
+                      //撤销id
+                      obj[WfForm.convertFieldNameToId("cxlyid", "detail_1")] = {value:item.id};
 
                       WfForm.addDetailRow("detail_1", obj);
                   })