diff --git a/resource/WEB-INF/config/mapper/hrmelog/ElogTableCheckerMapper.xml b/resource/WEB-INF/config/mapper/hrmelog/ElogTableCheckerMapper.xml
new file mode 100644
index 000000000..cbf1e900d
--- /dev/null
+++ b/resource/WEB-INF/config/mapper/hrmelog/ElogTableCheckerMapper.xml
@@ -0,0 +1,451 @@
+
+
+
+
+ insert into hrsa_elog_version (id, maintable, version) values (#{id},#{mainTable},#{version})
+
+
+
+ create table ${mainTable}
+ (
+ id bigint comment 'ID',
+ create_time datetime default current_timestamp ,
+ update_time datetime default current_timestamp ,
+ creator bigint,
+ delete_type int,
+ tenant_key varchar(10),
+ uuid char(36),
+ log_date datetime default current_timestamp ,
+ log_operator varchar(50),
+ operatorName varchar(50),
+ targetId varchar(50),
+ targetName text,
+ modulename varchar(100),
+ functionname varchar(100),
+ interfaceName varchar(100),
+ requesturl varchar(200),
+ requesturi varchar(200),
+ operateType varchar(50),
+ operatetypename varchar(100),
+ operatedesc varchar(1000),
+ params longtext,
+ belongmainid varchar(36),
+ clientIp varchar(50),
+ groupid varchar(50),
+ device varchar(200),
+ groupNameLabel varchar(500),
+ redoService varchar(200),
+ redoContext longtext,
+ cancelService varchar(200),
+ cancelContext longtext,
+ totalruntime bigint,
+ mainruntime bigint,
+ log_result varchar(100),
+ fromterminal varchar(100),
+ resultdesc text,
+ old_content varchar(1000),
+ link_type varchar(20),
+ link_id bigint,
+ old_link_id bigint,
+ PRIMARY KEY (id)
+ )
+
+
+
+ create table ${mainTable}
+ (
+ id number(*,0) not null primary key,
+ create_time date default sysdate,
+ update_time date default sysdate,
+ creator number(*,0),
+ delete_type number(*,0),
+ tenant_key varchar2(10),
+ uuid varchar2(36),
+ log_date date default sysdate,
+ log_operator varchar2(50),
+ operatorName varchar2(50),
+ targetId varchar2(50),
+ targetName varchar2(4000),
+ modulename varchar2(100),
+ functionname varchar2(100),
+ interfaceName varchar2(100),
+ requesturl varchar2(200),
+ requesturi varchar2(200),
+ operateType varchar2(50),
+ operatetypename varchar2(100),
+ operatedesc varchar2(1000),
+ params clob,
+ belongmainid varchar2(36),
+ clientIp varchar2(200),
+ groupid varchar2(50),
+ device varchar2(200),
+ groupNameLabel varchar2(500),
+ redoService varchar2(200),
+ redoContext varchar2(4000),
+ cancelService varchar2(200),
+ cancelContext varchar2(4000),
+ totalruntime number(*,0),
+ mainruntime number(*,0),
+ log_result varchar2(4000),
+ fromterminal varchar2(100),
+ resultdesc varchar2(4000),
+ old_content varchar2(1000),
+ link_type varchar2(20),
+ link_id number(*,0),
+ old_link_id number(*,0)
+ )
+
+
+ create table ${mainTable}
+ (
+ id bigint not null primary key,
+ create_time datetime default getdate(),
+ update_time datetime default getdate(),
+ creator bigint default '-1',
+ delete_type bigint default 0,
+ tenant_key nvarchar(10),
+ uuid nvarchar(36),
+ log_date datetime default getdate(),
+ device nvarchar(500),
+ log_operator bigint default '-1',
+ operatorname nvarchar(100),
+ targetid bigint default '-1',
+ targetname nvarchar(3000),
+ modulename nvarchar(100),
+ functionname nvarchar(100),
+ interfacename nvarchar(100),
+ requesturl nvarchar(200),
+ requesturi nvarchar(200),
+ operatetype nvarchar(50),
+ operatetypename nvarchar(100),
+ operatedesc nvarchar(3000),
+ params nvarchar(max),
+ belongmainid nvarchar(36),
+ clientip nvarchar(200),
+ groupid nvarchar(50),
+ groupnamelabel nvarchar(1000),
+ redoservice nvarchar(200),
+ redocontext nvarchar(3000),
+ cancelservice nvarchar(200),
+ cancelcontext nvarchar(3000),
+ totalruntime bigint default 0,
+ mainruntime bigint default 0,
+ log_result nvarchar(100),
+ fromterminal nvarchar(100),
+ resultdesc nvarchar(3000),
+ old_content nvarchar(3000),
+ link_type nvarchar(20),
+ link_id bigint default 0,
+ old_link_id bigint default 0
+ )
+
+
+ create table ${mainTable}
+ (
+ id int8 not null primary key,
+ create_time timestamp default current_timestamp,
+ update_time timestamp default current_timestamp,
+ creator int8,
+ delete_type int,
+ tenant_key varchar(10),
+ uuid varchar(36),
+ log_date timestamp default current_timestamp,
+ log_operator varchar(50),
+ operatorName varchar(50),
+ targetId varchar(50),
+ targetName text,
+ modulename varchar(100),
+ functionname varchar(100),
+ interfaceName varchar(100),
+ requesturl varchar(200),
+ requesturi varchar(200),
+ operateType varchar(50),
+ operatetypename varchar(100),
+ operatedesc varchar(1000),
+ params text,
+ belongmainid varchar(36),
+ clientIp varchar(200),
+ groupid varchar(50),
+ device varchar(200),
+ groupNameLabel varchar(500),
+ redoService varchar(200),
+ redoContext text,
+ cancelService varchar(200),
+ cancelContext text,
+ totalruntime int4,
+ mainruntime int4,
+ log_result varchar(100),
+ fromterminal varchar(100),
+ resultdesc text,
+ old_content varchar(1000),
+ link_type varchar(20),
+ link_id int4,
+ old_link_id int4
+ )
+
+
+ create table ${detailTable}
+ (
+ id bigint not null primary key,
+ create_time datetime default current_timestamp ,
+ update_time datetime default current_timestamp ,
+ creator bigint,
+ delete_type int,
+ tenant_key varchar(10),
+ uuid varchar(36),
+ mainid varchar(36),
+ dataid varchar(50),
+ belongdataid varchar(50),
+ tableName varchar(200),
+ tablenamelabelid varchar(50),
+ tablenamedesc varchar(50),
+ fieldName varchar(200),
+ fieldnamelabelid varchar(200),
+ newValue longtext,
+ oldValue longtext,
+ newrealvalue longtext,
+ oldrealvalue longtext,
+ fieldDesc varchar(200),
+ showorder int default 0,
+ isdetail int default 0
+ )
+
+
+ create table ${detailTable}
+ (
+ id int8 not null primary key,
+ create_time timestamp default current_timestamp ,
+ update_time timestamp default current_timestamp ,
+ creator int8,
+ delete_type int8,
+ tenant_key varchar(10),
+ uuid varchar(36),
+ mainid varchar(36),
+ dataid varchar(50),
+ belongdataid varchar(50),
+ tableName varchar(200),
+ tablenamelabelid varchar(50),
+ tablenamedesc varchar(50),
+ fieldName varchar(200),
+ fieldnamelabelid varchar(200),
+ newValue text,
+ oldValue text,
+ newrealvalue text,
+ oldrealvalue text,
+ fieldDesc varchar(200),
+ showorder int8 default 0,
+ isdetail int8 default 0
+ )
+
+
+ create table ${detailTable}
+ (
+ id number(*,0) not null primary key,
+ create_time date default sysdate,
+ update_time date default sysdate,
+ creator number(*,0),
+ delete_type number(*,0),
+ tenant_key varchar2(10),
+ uuid varchar2(36),
+ mainid varchar2(36),
+ dataid varchar2(50),
+ belongdataid varchar2(50),
+ tableName varchar2(200),
+ tablenamelabelid varchar2(50),
+ tablenamedesc varchar2(50),
+ fieldName varchar2(200),
+ fieldnamelabelid varchar2(200),
+ newValue CLOB,
+ oldValue CLOB,
+ newrealvalue CLOB,
+ oldrealvalue CLOB,
+ fieldDesc varchar2(200),
+ showorder number(*,0) default 0,
+ isdetail number(*,0) default 0
+ )
+
+
+ create table ${detailTable}
+ (
+ id bigint not null primary key,
+ create_time datetime default getdate(),
+ update_time datetime default getdate(),
+ creator bigint,
+ delete_type bigint,
+ tenant_key nvarchar(10),
+ uuid nvarchar(36),
+ mainid nvarchar(36),
+ dataid nvarchar(50),
+ belongdataid nvarchar(50),
+ tableName nvarchar(200),
+ tablenamelabelid nvarchar(50),
+ tablenamedesc nvarchar(50),
+ fieldName nvarchar(200),
+ fieldnamelabelid nvarchar(200),
+ newValue nvarchar(max),
+ oldValue nvarchar(max),
+ newrealvalue nvarchar(max),
+ oldrealvalue nvarchar(max),
+ fieldDesc varchar(200),
+ showorder bigint default 0,
+ isdetail bigint default 0
+ )
+
+
+
+
+
+
+
+
+
+
+ ${createElogSql}
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ create index idx${id} on ${tableName} (${columnName})
+
+
+
+ create index idx${id} on ${tableName} (${columnName})
+
+
+
+ create index idx${id} on ${tableName} (${columnName})
+
+
+
+
+
+
+
+
+
+
diff --git a/resource/WEB-INF/config/mapper/hrmelog/LocalElogAopDaoMapper.xml b/resource/WEB-INF/config/mapper/hrmelog/LocalElogAopDaoMapper.xml
new file mode 100644
index 000000000..8fcc1b9c1
--- /dev/null
+++ b/resource/WEB-INF/config/mapper/hrmelog/LocalElogAopDaoMapper.xml
@@ -0,0 +1,170 @@
+
+
+
+
+
+ insert into ${tableName} (id, uuid, log_date, tenant_key, modulename, functionName, operatetypename,
+ log_operator, operatorname, targetid, targetname, interfacename, operatetype,
+ operatedesc,
+ params, clientIp, groupnamelabel, redoservice, redocontext, cancelservice,
+ cancelcontext, device, groupid,
+ belongMainId, requestUrl, requestUri, totalRunTime, mainRunTime, log_result,
+ fromTerminal, resultDesc, old_content,
+ link_type, link_id, old_link_id, create_time, update_time, delete_type, creator
+ ${cusColumns})
+ values (#{logContent.id}, #{logContent.uuid}, #{logContent.date},
+ #{logContent.tenant_key}, #{logContent.moduleName}, #{logContent.functionName},
+ #{logContent.operateTypeName}, #{logContent.logOperator}, #{logContent.operatorName},
+ #{logContent.logTargetid}
+ , #{logContent.targetName}, #{logContent.interfaceName}, #{logContent.operateType},
+ #{logContent.operatedesc},
+ #{logContent.paramsStr}, #{logContent.clientIp}, #{logContent.groupNameLabel},
+ #{logContent.redoService},
+ #{logContent.redoContextStr}, #{logContent.cancelService}, #{logContent.cancelContextStr},
+ #{logContent.device}, #{logContent.groupId},
+ #{logContent.belongMainId}, #{logContent.requestUrl}, #{logContent.requestUri},
+ #{logContent.totalRunTime}, #{logContent.mainRunTime}
+ , #{logContent.result}, #{logContent.fromTerminal}, #{logContent.resultDesc},
+ #{logContent.old_content}, #{logContent.link_type}
+ , #{logContent.link_id}, #{logContent.old_link_id}, #{logContent.create_time},
+ #{logContent.update_time}, #{logContent.delete_type}, #{logContent.logOperator}
+ ${cusValus})
+
+
+
+ insert into ${detailTableName} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue,
+ fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key, creator,
+ newRealValue, oldRealValue, tableNameDesc,
+ tableNameLabelId, fieldNameLabelId, create_time, update_time
+ ${cusColumns})
+ values (#{detailContext.id}, #{mainid}, #{detailContext.uuid}, #{detailContext.tableName},
+ #{detailContext.fieldName}, #{detailContext.newValue},
+ #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder},
+ #{detailContext.dataid},
+ #{detailContext.belongDataid}, #{detailContext.isDetail}, #{detailContext.tenant_key},
+ #{detailContext.creator}, #{detailContext.newRealValue}
+ , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId},
+ #{detailContext.fieldNameLabelId}, #{detailContext.create_time}, #{detailContext.update_time}
+ ${cusValus})
+
+
+ ${sql}
+
+
+
+
+
+
+
+ insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue,
+ fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue,
+ oldRealValue,tableNameDesc,
+ tableNameLabelId,fieldNameLabelId, create_time, update_time,delete_type)
+ values
+
+ ( #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName},
+ #{detailContext.fieldName}, #{detailContext.newValue},
+ #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid},
+ #{detailContext.belongDataid}, #{detailContext.isDetail},
+ #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue}
+ , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId},
+ #{detailContext.fieldNameLabelId}
+ , #{detailContext.create_time}, #{detailContext.update_time}, #{detailContext.delete_type})
+
+
+
+
+
+ insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue,
+ fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue,
+ oldRealValue,tableNameDesc,
+ tableNameLabelId,fieldNameLabelId, create_time, update_time,delete_type)
+ VALUES
+ (
+ #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName},
+ #{detailContext.fieldName}, #{detailContext.newValue},
+ #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid},
+ #{detailContext.belongDataid}, #{detailContext.isDetail},
+ #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue}
+ , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId},
+ #{detailContext.fieldNameLabelId}
+ , #{detailContext.create_time}, #{detailContext.update_time}, #{detailContext.delete_type}
+ )
+
+
+
+
+ insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue,
+ fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue,
+ oldRealValue,tableNameDesc,
+ tableNameLabelId,fieldNameLabelId, create_time, update_time
+ ${cusColumns})
+ values
+
+ ( #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName},
+ #{detailContext.fieldName}, #{detailContext.newValue},
+ #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid},
+ #{detailContext.belongDataid}, #{detailContext.isDetail},
+ #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue}
+ , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId},
+ #{detailContext.fieldNameLabelId}
+ , #{detailContext.create_time}, #{detailContext.update_time}
+ ${detailContext.cusValus})
+
+
+
+
+ update ${tableName}
+ set delete_type = 3
+ where id = #{id}
+
+
+ update ${tableName}
+ set delete_type = 3
+ where mainid = #{mainid}
+
+
+
+ insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue,
+ fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue,
+ oldRealValue,tableNameDesc,
+ tableNameLabelId,fieldNameLabelId, create_time, update_time,delete_type)
+
+ SELECT #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName},
+ #{detailContext.fieldName}, #{detailContext.newValue},
+ #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid},
+ #{detailContext.belongDataid}, #{detailContext.isDetail},
+ #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue}
+ , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId},
+ #{detailContext.fieldNameLabelId}
+ , #{detailContext.create_time}, #{detailContext.update_time}, #{detailContext.delete_type}
+ FROM DUAL
+
+
+
+
+ insert into ${tablename} (id, mainid, uuid, tablename, fieldname, newvalue, oldvalue,
+ fielddesc, showorder, dataid, belongDataid, isDetail, tenant_key,creator, newRealValue,
+ oldRealValue,tableNameDesc,
+ tableNameLabelId,fieldNameLabelId, create_time, update_time
+ ${cusColumns})
+
+ SELECT #{detailContext.id},#{mainid}, #{detailContext.uuid}, #{detailContext.tableName},
+ #{detailContext.fieldName}, #{detailContext.newValue},
+ #{detailContext.oldValue}, #{detailContext.fieldDesc}, #{detailContext.showorder}, #{detailContext.dataid},
+ #{detailContext.belongDataid}, #{detailContext.isDetail},
+ #{detailContext.tenant_key},#{detailContext.creator}, #{detailContext.newRealValue}
+ , #{detailContext.oldRealValue}, #{detailContext.tableNameDesc}, #{detailContext.tableNameLabelId},
+ #{detailContext.fieldNameLabelId}
+ , #{detailContext.create_time}, #{detailContext.update_time}
+ ${detailContext.cusValus}
+ FROM DUAL
+
+
+
+
diff --git a/resource/WEB-INF/config/mapper/hrmelog/LocalElogDaoMapper.xml b/resource/WEB-INF/config/mapper/hrmelog/LocalElogDaoMapper.xml
new file mode 100644
index 000000000..2c1f0f427
--- /dev/null
+++ b/resource/WEB-INF/config/mapper/hrmelog/LocalElogDaoMapper.xml
@@ -0,0 +1,412 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resource/WEB-INF/config/mapper/hrmelog/QueryCurretValusMapper.xml b/resource/WEB-INF/config/mapper/hrmelog/QueryCurretValusMapper.xml
new file mode 100644
index 000000000..b88e3cfee
--- /dev/null
+++ b/resource/WEB-INF/config/mapper/hrmelog/QueryCurretValusMapper.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/resource/WEB-INF/lib/hrmelog.jar b/resource/WEB-INF/lib/hrmelog.jar
index 633076bbe..b2657be84 100644
Binary files a/resource/WEB-INF/lib/hrmelog.jar and b/resource/WEB-INF/lib/hrmelog.jar differ
diff --git a/resource/WEB-INF/prop/hrmSalaryBillToken.properties b/resource/wiki/扩展功能/hrmSalaryBillToken.properties
similarity index 100%
rename from resource/WEB-INF/prop/hrmSalaryBillToken.properties
rename to resource/wiki/扩展功能/hrmSalaryBillToken.properties
diff --git a/resource/WEB-INF/prop/hrmSalaryCustom.properties b/resource/wiki/扩展功能/hrmSalaryCustom.properties
similarity index 100%
rename from resource/WEB-INF/prop/hrmSalaryCustom.properties
rename to resource/wiki/扩展功能/hrmSalaryCustom.properties
diff --git a/resource/WEB-INF/prop/hrmSalaryPayroll.properties b/resource/wiki/扩展功能/hrmSalaryPayroll.properties
similarity index 100%
rename from resource/WEB-INF/prop/hrmSalaryPayroll.properties
rename to resource/wiki/扩展功能/hrmSalaryPayroll.properties
diff --git a/src/com/engine/salary/biz/OtherDeductionBiz.java b/src/com/engine/salary/biz/OtherDeductionBiz.java
index b56e4f57c..175a65c40 100644
--- a/src/com/engine/salary/biz/OtherDeductionBiz.java
+++ b/src/com/engine/salary/biz/OtherDeductionBiz.java
@@ -1,7 +1,7 @@
package com.engine.salary.biz;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.dto.OtherDeductionRecordDTO;
import com.engine.salary.entity.datacollection.param.OtherDeductionQueryParam;
diff --git a/src/com/engine/salary/biz/SpecialAddDeductionBiz.java b/src/com/engine/salary/biz/SpecialAddDeductionBiz.java
index bf6f87f0a..a2203e89f 100644
--- a/src/com/engine/salary/biz/SpecialAddDeductionBiz.java
+++ b/src/com/engine/salary/biz/SpecialAddDeductionBiz.java
@@ -1,7 +1,7 @@
package com.engine.salary.biz;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.dto.SpecialAddDeductionListDTO;
import com.engine.salary.entity.datacollection.dto.SpecialAddDeductionRecordDTO;
diff --git a/src/com/engine/salary/config/SalaryElogConfig.java b/src/com/engine/salary/config/SalaryElogConfig.java
index 6d41b6af8..7d9f79321 100644
--- a/src/com/engine/salary/config/SalaryElogConfig.java
+++ b/src/com/engine/salary/config/SalaryElogConfig.java
@@ -1,7 +1,7 @@
package com.engine.salary.config;
-import com.engine.salary.elog.util.LoggerTemplate;
-import com.engine.salary.elog.util.LoggerTemplateBuilder;
+import com.engine.hrmelog.util.LoggerTemplate;
+import com.engine.hrmelog.util.LoggerTemplateBuilder;
/**
* elog日志
diff --git a/src/com/engine/salary/entity/datacollection/AddUpDeduction.java b/src/com/engine/salary/entity/datacollection/AddUpDeduction.java
index 36d769602..9a2213a0e 100644
--- a/src/com/engine/salary/entity/datacollection/AddUpDeduction.java
+++ b/src/com/engine/salary/entity/datacollection/AddUpDeduction.java
@@ -2,7 +2,7 @@ package com.engine.salary.entity.datacollection;
import com.engine.salary.annotation.Encrypt;
import com.engine.salary.annotation.SalaryFormulaVar;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/datacollection/AddUpSituation.java b/src/com/engine/salary/entity/datacollection/AddUpSituation.java
index 0dd5af09f..b6d456bb8 100644
--- a/src/com/engine/salary/entity/datacollection/AddUpSituation.java
+++ b/src/com/engine/salary/entity/datacollection/AddUpSituation.java
@@ -4,7 +4,7 @@ import com.engine.salary.annotation.Encrypt;
import com.engine.salary.annotation.SalaryFormulaVar;
import com.engine.salary.annotation.SalaryTable;
import com.engine.salary.annotation.SalaryTableOperate;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/datacollection/po/AttendQuoteFieldPO.java b/src/com/engine/salary/entity/datacollection/po/AttendQuoteFieldPO.java
index dd14545f8..a237aa48f 100644
--- a/src/com/engine/salary/entity/datacollection/po/AttendQuoteFieldPO.java
+++ b/src/com/engine/salary/entity/datacollection/po/AttendQuoteFieldPO.java
@@ -1,6 +1,6 @@
package com.engine.salary.entity.datacollection.po;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/datacollection/po/AttendQuotePO.java b/src/com/engine/salary/entity/datacollection/po/AttendQuotePO.java
index 5dd26b136..133e3f788 100644
--- a/src/com/engine/salary/entity/datacollection/po/AttendQuotePO.java
+++ b/src/com/engine/salary/entity/datacollection/po/AttendQuotePO.java
@@ -1,6 +1,6 @@
package com.engine.salary.entity.datacollection.po;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java b/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java
index 4a0b5d443..83f1ec932 100644
--- a/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java
+++ b/src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java
@@ -2,7 +2,7 @@ package com.engine.salary.entity.datacollection.po;
import com.engine.salary.annotation.Encrypt;
import com.engine.salary.annotation.SalaryFormulaVar;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java b/src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java
index afa5ea4e9..ce5f49f8a 100644
--- a/src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java
+++ b/src/com/engine/salary/entity/datacollection/po/SpecialAddDeductionPO.java
@@ -1,7 +1,7 @@
package com.engine.salary.entity.datacollection.po;
import com.engine.salary.annotation.Encrypt;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/extemp/po/ExtEmpPO.java b/src/com/engine/salary/entity/extemp/po/ExtEmpPO.java
index e936ccf79..e7b73d457 100644
--- a/src/com/engine/salary/entity/extemp/po/ExtEmpPO.java
+++ b/src/com/engine/salary/entity/extemp/po/ExtEmpPO.java
@@ -2,7 +2,7 @@ package com.engine.salary.entity.extemp.po;
import com.engine.salary.annotation.TableTitle;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java b/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java
index 751fef2ac..3538a3387 100644
--- a/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java
+++ b/src/com/engine/salary/entity/salaryBill/dto/SalaryTemplateListDTO.java
@@ -4,7 +4,7 @@ import com.engine.salary.annotation.SalaryTable;
import com.engine.salary.annotation.SalaryTableColumn;
import com.engine.salary.annotation.SalaryTableOperate;
import com.engine.salary.annotation.TableTitle;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/salaryBill/po/SalarySendPO.java b/src/com/engine/salary/entity/salaryBill/po/SalarySendPO.java
index 755241ea3..7249346b6 100644
--- a/src/com/engine/salary/entity/salaryBill/po/SalarySendPO.java
+++ b/src/com/engine/salary/entity/salaryBill/po/SalarySendPO.java
@@ -1,6 +1,6 @@
package com.engine.salary.entity.salaryBill.po;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java b/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java
index c13e72c76..825f82759 100644
--- a/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java
+++ b/src/com/engine/salary/entity/salaryBill/po/SalaryTemplatePO.java
@@ -1,6 +1,6 @@
package com.engine.salary.entity.salaryBill.po;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java
index 9320e11d6..322fc6c68 100644
--- a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java
+++ b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java
@@ -1,7 +1,7 @@
package com.engine.salary.entity.salaryacct.po;
import com.engine.salary.annotation.SalaryFormulaVar;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java
index 3af046bdb..d2f089f21 100644
--- a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java
+++ b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java
@@ -1,7 +1,7 @@
package com.engine.salary.entity.salaryacct.po;
import com.engine.salary.common.LocalDateRange;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.salaryaccounting.SalaryAcctRecordStatusEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctResultPO.java b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctResultPO.java
index 316a78944..4df634452 100644
--- a/src/com/engine/salary/entity/salaryacct/po/SalaryAcctResultPO.java
+++ b/src/com/engine/salary/entity/salaryacct/po/SalaryAcctResultPO.java
@@ -1,7 +1,7 @@
package com.engine.salary.entity.salaryacct.po;
import com.engine.salary.annotation.Encrypt;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/salaryarchive/po/SalaryArchiveItemPO.java b/src/com/engine/salary/entity/salaryarchive/po/SalaryArchiveItemPO.java
index c4b689e7d..782d34348 100644
--- a/src/com/engine/salary/entity/salaryarchive/po/SalaryArchiveItemPO.java
+++ b/src/com/engine/salary/entity/salaryarchive/po/SalaryArchiveItemPO.java
@@ -1,7 +1,7 @@
package com.engine.salary.entity.salaryarchive.po;
import com.engine.salary.annotation.Encrypt;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java b/src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java
index 25d4dbdd6..a1762c54b 100644
--- a/src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java
+++ b/src/com/engine/salary/entity/salaryarchive/po/SalaryArchivePO.java
@@ -1,6 +1,6 @@
package com.engine.salary.entity.salaryarchive.po;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum;
import com.engine.salary.enums.salaryarchive.SalaryArchiveStatusEnum;
import com.engine.salary.enums.salaryarchive.SalaryArchiveAddTypeEnum;
diff --git a/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java b/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java
index ea0844eb5..8db3c3c89 100644
--- a/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java
+++ b/src/com/engine/salary/entity/salaryitem/po/SalaryItemPO.java
@@ -1,6 +1,6 @@
package com.engine.salary.entity.salaryitem.po;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.SalaryRoundingModeEnum;
import com.engine.salary.enums.SalarySystemTypeEnum;
import com.engine.salary.enums.SalaryValueTypeEnum;
diff --git a/src/com/engine/salary/entity/salarysob/param/SalarySobRangeSaveParam.java b/src/com/engine/salary/entity/salarysob/param/SalarySobRangeSaveParam.java
index 41acf67cf..ff2cdd876 100644
--- a/src/com/engine/salary/entity/salarysob/param/SalarySobRangeSaveParam.java
+++ b/src/com/engine/salary/entity/salarysob/param/SalarySobRangeSaveParam.java
@@ -1,6 +1,6 @@
package com.engine.salary.entity.salarysob.param;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum;
import com.engine.salary.enums.salarysob.TargetTypeEnum;
import com.engine.salary.util.valid.DataCheck;
diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java
index 47d8938ef..15704802b 100644
--- a/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java
+++ b/src/com/engine/salary/entity/salarysob/po/SalarySobItemPO.java
@@ -1,6 +1,6 @@
package com.engine.salary.entity.salarysob.po;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.SalaryRoundingModeEnum;
import com.engine.salary.enums.SalaryValueTypeEnum;
import lombok.AllArgsConstructor;
diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
index 68712f06c..1b314b536 100644
--- a/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
+++ b/src/com/engine/salary/entity/salarysob/po/SalarySobPO.java
@@ -1,6 +1,6 @@
package com.engine.salary.entity.salarysob.po;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/salarysob/po/SalarySobRangePO.java b/src/com/engine/salary/entity/salarysob/po/SalarySobRangePO.java
index 08dee470f..08a1df20f 100644
--- a/src/com/engine/salary/entity/salarysob/po/SalarySobRangePO.java
+++ b/src/com/engine/salary/entity/salarysob/po/SalarySobRangePO.java
@@ -1,6 +1,6 @@
package com.engine.salary.entity.salarysob.po;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.salarysob.SalaryEmployeeStatusEnum;
import com.engine.salary.enums.salarysob.TargetTypeEnum;
import lombok.AllArgsConstructor;
diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java
index 45de6f2ab..362815eef 100644
--- a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java
+++ b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountBatchPO.java
@@ -1,7 +1,7 @@
package com.engine.salary.entity.siaccount.po;
import com.engine.salary.annotation.Encrypt;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java
index 9b7c33cef..aadf8b4bb 100644
--- a/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java
+++ b/src/com/engine/salary/entity/siaccount/po/InsuranceAccountDetailPO.java
@@ -3,7 +3,7 @@ package com.engine.salary.entity.siaccount.po;
import com.cloudstore.eccom.pc.table.WeaTableType;
import com.engine.salary.annotation.Encrypt;
import com.engine.salary.annotation.SalaryTable;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationPO.java b/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationPO.java
index ff9ece22b..c4e8b1fe7 100644
--- a/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationPO.java
+++ b/src/com/engine/salary/entity/siaccount/po/InsuranceCompensationPO.java
@@ -1,6 +1,6 @@
package com.engine.salary.entity.siaccount.po;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseInfoPO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseInfoPO.java
index 1ed65489f..0a5dd7b01 100644
--- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseInfoPO.java
+++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesBaseInfoPO.java
@@ -1,6 +1,6 @@
package com.engine.salary.entity.siarchives.po;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.datacollection.DataCollectionEmployeeTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java
index 15e37cfb0..e4e9573c4 100644
--- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java
+++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesFundSchemePO.java
@@ -1,7 +1,7 @@
package com.engine.salary.entity.siarchives.po;
import com.engine.salary.annotation.Encrypt;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java
index 71836e143..c8086a1e1 100644
--- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java
+++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesOtherSchemePO.java
@@ -1,7 +1,7 @@
package com.engine.salary.entity.siarchives.po;
import com.engine.salary.annotation.Encrypt;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java
index 5e5c3cf9e..a0b4a8b87 100644
--- a/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java
+++ b/src/com/engine/salary/entity/siarchives/po/InsuranceArchivesSocialSchemePO.java
@@ -1,7 +1,7 @@
package com.engine.salary.entity.siarchives.po;
import com.engine.salary.annotation.Encrypt;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/sischeme/po/InsuranceSchemeDetailPO.java b/src/com/engine/salary/entity/sischeme/po/InsuranceSchemeDetailPO.java
index 3d4200f65..e7ce260f1 100644
--- a/src/com/engine/salary/entity/sischeme/po/InsuranceSchemeDetailPO.java
+++ b/src/com/engine/salary/entity/sischeme/po/InsuranceSchemeDetailPO.java
@@ -1,7 +1,7 @@
package com.engine.salary.entity.sischeme.po;
import com.engine.salary.annotation.Encrypt;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/entity/sischeme/po/InsuranceSchemePO.java b/src/com/engine/salary/entity/sischeme/po/InsuranceSchemePO.java
index 8cdcc7f6c..e832d801d 100644
--- a/src/com/engine/salary/entity/sischeme/po/InsuranceSchemePO.java
+++ b/src/com/engine/salary/entity/sischeme/po/InsuranceSchemePO.java
@@ -1,6 +1,6 @@
package com.engine.salary.entity.sischeme.po;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.sicategory.SharedTypeEnum;
import lombok.AllArgsConstructor;
import lombok.Builder;
diff --git a/src/com/engine/salary/entity/taxagent/po/TaxAgentManageRangePO.java b/src/com/engine/salary/entity/taxagent/po/TaxAgentManageRangePO.java
index c22ef32df..ae4c8b9b7 100644
--- a/src/com/engine/salary/entity/taxagent/po/TaxAgentManageRangePO.java
+++ b/src/com/engine/salary/entity/taxagent/po/TaxAgentManageRangePO.java
@@ -1,6 +1,6 @@
package com.engine.salary.entity.taxagent.po;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.enums.salarysob.TargetTypeEnum;
import com.engine.salary.enums.taxagent.TaxAgentRangeTypeEnum;
import lombok.AllArgsConstructor;
diff --git a/src/com/engine/salary/entity/taxagent/po/TaxAgentPO.java b/src/com/engine/salary/entity/taxagent/po/TaxAgentPO.java
index c6444f697..819bf3aaf 100644
--- a/src/com/engine/salary/entity/taxagent/po/TaxAgentPO.java
+++ b/src/com/engine/salary/entity/taxagent/po/TaxAgentPO.java
@@ -1,6 +1,6 @@
package com.engine.salary.entity.taxagent.po;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java b/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java
index aa359b7e6..5c1b3bb52 100644
--- a/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java
+++ b/src/com/engine/salary/report/entity/po/SalaryStatisticsItemPO.java
@@ -1,6 +1,6 @@
package com.engine.salary.report.entity.po;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import com.engine.salary.report.enums.UnitTypeEnum;
import lombok.*;
diff --git a/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java b/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java
index b1d96f726..08061bddd 100644
--- a/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java
+++ b/src/com/engine/salary/report/entity/po/SalaryStatisticsReportPO.java
@@ -1,6 +1,6 @@
package com.engine.salary.report.entity.po;
-import com.engine.salary.elog.annotation.ElogTransform;
+import com.engine.hrmelog.annotation.ElogTransform;
import lombok.AllArgsConstructor;
import lombok.Builder;
import lombok.Data;
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java
index 176192125..e7eb0bcc5 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsItemServiceImpl.java
@@ -3,7 +3,7 @@ package com.engine.salary.report.service.impl;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.enums.OperateTypeEnum;
import com.engine.salary.enums.sicategory.DeleteTypeEnum;
import com.engine.salary.exception.SalaryRunTimeException;
diff --git a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
index b0fe69d71..db2f739c0 100644
--- a/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
+++ b/src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java
@@ -6,7 +6,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.cache.SalaryCacheKey;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.hrm.dto.EmployeeInfoExpandDTO;
import com.engine.salary.entity.hrm.dto.FieldSetting;
diff --git a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
index 440c4a419..0ccb7df05 100644
--- a/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
+++ b/src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java
@@ -11,7 +11,7 @@ import com.engine.salary.cache.SalaryCacheKey;
import com.engine.salary.component.WeaFormOption;
import com.engine.salary.component.WeaTableColumnGroup;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
import com.engine.salary.enums.OperateTypeEnum;
import com.engine.salary.exception.SalaryRunTimeException;
diff --git a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
index cf1361513..f56502c0f 100644
--- a/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java
@@ -12,7 +12,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.biz.AddUpDeductionBiz;
import com.engine.salary.common.LocalDateRange;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.AddUpDeduction;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
diff --git a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
index 6d3d00770..e09ef12fe 100644
--- a/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
@@ -9,7 +9,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.biz.AddUpSituationBiz;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.AddUpSituation;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
diff --git a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
index 9a03ab6f3..9216e7841 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteDataServiceImpl.java
@@ -15,7 +15,7 @@ import com.engine.salary.biz.AttendQuoteFieldBiz;
import com.engine.salary.common.LocalDateRange;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.datacollection.bo.AttendQuoteDataBO;
import com.engine.salary.entity.datacollection.dto.*;
diff --git a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
index 37d3ff3f6..2448254f9 100644
--- a/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
+++ b/src/com/engine/salary/service/impl/AttendQuoteFieldServiceImpl.java
@@ -6,7 +6,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.biz.AttendQuoteFieldBiz;
import com.engine.salary.component.SalaryWeaTable;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.dto.AttendQuoteFieldListDTO;
import com.engine.salary.entity.datacollection.param.AttendQuoteFieldQueryParam;
import com.engine.salary.entity.datacollection.param.AttendQuoteFieldSaveParam;
diff --git a/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java b/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
index e584332e5..38e91c606 100644
--- a/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
+++ b/src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
@@ -3,7 +3,7 @@ package com.engine.salary.service.impl;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.extemp.param.ExtEmpImportParam;
import com.engine.salary.entity.extemp.param.ExtEmpQueryParam;
diff --git a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
index 57f2d20a6..837427adb 100644
--- a/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java
@@ -7,7 +7,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.biz.OtherDeductionBiz;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.AddUpDeduction;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
diff --git a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
index 7843063e2..f10d679f7 100644
--- a/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIAccountServiceImpl.java
@@ -16,7 +16,7 @@ import com.engine.salary.cache.SalaryCacheKey;
import com.engine.salary.component.SalaryWeaTable;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.constant.SalaryItemConstant;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
diff --git a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
index d0d76bd4d..9dd1e070f 100644
--- a/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIArchivesServiceImpl.java
@@ -20,7 +20,7 @@ import com.engine.salary.cmd.siarchives.SIArchivesTipsCmd;
import com.engine.salary.common.SalaryContext;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.siarchives.bo.InsuranceArchivesBO;
diff --git a/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java b/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
index 6e746c358..6714938a3 100644
--- a/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIBalanceServiceImpl.java
@@ -6,7 +6,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.siaccount.param.BalanceAccountBaseParam;
import com.engine.salary.entity.siaccount.param.EditAccountDetailParam;
diff --git a/src/com/engine/salary/service/impl/SICategoryServiceImpl.java b/src/com/engine/salary/service/impl/SICategoryServiceImpl.java
index 7e127f570..875947741 100644
--- a/src/com/engine/salary/service/impl/SICategoryServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SICategoryServiceImpl.java
@@ -7,7 +7,7 @@ import com.api.browser.util.ConditionType;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.siaccount.po.InsuranceAccountDetailPO;
import com.engine.salary.entity.sicategory.bo.ICategoryBO;
diff --git a/src/com/engine/salary/service/impl/SICompensationServiceImpl.java b/src/com/engine/salary/service/impl/SICompensationServiceImpl.java
index b83448c67..25bf127a0 100644
--- a/src/com/engine/salary/service/impl/SICompensationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SICompensationServiceImpl.java
@@ -8,7 +8,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.hrm.dto.HrmInfoDTO;
diff --git a/src/com/engine/salary/service/impl/SIExportServiceImpl.java b/src/com/engine/salary/service/impl/SIExportServiceImpl.java
index 3ec48edbb..3c2ab86c4 100644
--- a/src/com/engine/salary/service/impl/SIExportServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIExportServiceImpl.java
@@ -6,7 +6,7 @@ import com.cloudstore.eccom.pc.table.WeaTableColumn;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.siaccount.dto.InsuranceAccountViewListDTO;
import com.engine.salary.entity.siaccount.param.InsuranceAccountDetailParam;
diff --git a/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java b/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java
index 494838d25..6766dae2b 100644
--- a/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SIRecessionServiceImpl.java
@@ -5,7 +5,7 @@ import com.api.formmode.mybatis.util.SqlProxyHandle;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.hrm.dto.HrmInfoDTO;
import com.engine.salary.entity.hrm.param.HrmQueryParam;
diff --git a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
index 74147039a..66945d79b 100644
--- a/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SISchemeServiceImpl.java
@@ -10,7 +10,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.component.SalaryWeaTable;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.siarchives.param.InsuranceArchivesListParam;
diff --git a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
index 4d2901991..f8120fd0d 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java
@@ -7,7 +7,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.salaryacct.bo.SalaryAcctEmployeeBO;
import com.engine.salary.entity.salaryacct.dto.SalaryAcctEmployeeCountDTO;
diff --git a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
index ccf771652..ec0529b81 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java
@@ -8,7 +8,7 @@ import com.engine.salary.component.WeaTableColumnGroup;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.constant.SalaryItemConstant;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.report.po.SalaryAcctResultReportPO;
import com.engine.salary.entity.salaryacct.bo.SalaryAcctEmployeeBO;
diff --git a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
index dfc42d16c..3014c62eb 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java
@@ -5,7 +5,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.common.LocalDateRange;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryBill.po.SalarySendPO;
import com.engine.salary.entity.salaryacct.bo.SalaryAcctRecordBO;
import com.engine.salary.entity.salaryacct.param.SalaryAcctRecordQueryParam;
diff --git a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
index fb441a434..c391b1ef1 100644
--- a/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
@@ -6,8 +6,8 @@ import com.engine.salary.cache.SalaryCacheKey;
import com.engine.salary.common.LocalDateRange;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
-import com.engine.salary.elog.entity.dto.LoggerContext;
-import com.engine.salary.elog.util.LoggerTemplate;
+import com.engine.hrmelog.entity.dto.LoggerContext;
+import com.engine.hrmelog.util.LoggerTemplate;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.datacollection.dto.AttendQuoteFieldListDTO;
diff --git a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
index 32c6cbd30..b5958e8bf 100644
--- a/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
@@ -8,7 +8,7 @@ import com.engine.salary.common.LocalDateRange;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
import com.engine.salary.constant.SalaryItemConstant;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.AddUpSituation;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.salaryarchive.bo.SalaryArchiveBO;
diff --git a/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java b/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
index 4789efd76..c2af2d6e1 100644
--- a/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
@@ -10,7 +10,7 @@ import com.engine.salary.biz.SalarySendInfoBiz;
import com.engine.salary.cache.SalaryCacheKey;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.HrmSalaryPayrollConf;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.progress.ProgressDTO;
import com.engine.salary.entity.salaryBill.bo.SalaryBillBO;
diff --git a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
index ca9160cdd..c59afdced 100644
--- a/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
@@ -6,7 +6,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.biz.SalaryItemBiz;
import com.engine.salary.biz.SysSalaryItemBiz;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryformula.po.FormulaPO;
import com.engine.salary.entity.salaryformula.po.FormulaVar;
import com.engine.salary.entity.salaryitem.bo.SalaryItemBO;
diff --git a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
index 1189589c8..47f3c48d8 100644
--- a/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySendServiceImpl.java
@@ -15,7 +15,7 @@ import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryArchiveConstant;
import com.engine.salary.constant.SalaryItemConstant;
import com.engine.salary.constant.SalaryTemplateSalaryItemSetGroupConstant;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.AddUpSituation;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
diff --git a/src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java
index 160151c16..4da850226 100644
--- a/src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySobAdjustRuleServiceImpl.java
@@ -3,7 +3,7 @@ package com.engine.salary.service.impl;
import com.engine.core.impl.Service;
import com.engine.salary.biz.SalarySobAdjustRuleBiz;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salarysob.bo.SalarySobAdjustRuleBO;
import com.engine.salary.entity.salarysob.param.SalarySobAdjustRuleSaveParam;
import com.engine.salary.entity.salarysob.po.SalarySobAdjustRulePO;
diff --git a/src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java
index 103b62de8..0489b8ab9 100644
--- a/src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySobCheckRuleServiceImpl.java
@@ -4,7 +4,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.biz.SalarySobCheckRuleBiz;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salarysob.bo.SalarySobCheckRuleBO;
import com.engine.salary.entity.salarysob.param.SalarySobCheckRuleQueryParam;
import com.engine.salary.entity.salarysob.param.SalarySobCheckRuleSaveParam;
diff --git a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
index 2729bf81f..d857a9709 100644
--- a/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
@@ -8,7 +8,7 @@ import com.engine.salary.biz.SalarySobItemGroupBiz;
import com.engine.salary.biz.SalarySobItemHideBiz;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryformula.ExpressFormula;
import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
import com.engine.salary.entity.salarysob.bo.SalarySobItemAggregateBO;
diff --git a/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
index 37275ce6f..cebcefa63 100644
--- a/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySobRangeServiceImpl.java
@@ -7,7 +7,7 @@ import com.engine.hrm.biz.OrganizationShowSetBiz;
import com.engine.salary.biz.SalarySobRangeBiz;
import com.engine.salary.biz.SpecialAddDeductionBiz;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.hrm.DeptInfo;
import com.engine.salary.entity.hrm.PositionInfo;
diff --git a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java
index 384fcbe0b..518accbe0 100644
--- a/src/com/engine/salary/service/impl/SalarySobServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalarySobServiceImpl.java
@@ -5,7 +5,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.biz.*;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryDefaultTenantConstant;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryBill.po.SalaryTemplatePO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
import com.engine.salary.entity.salaryitem.bo.SysSalaryItemBO;
diff --git a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
index c32877e01..2bf76796f 100644
--- a/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java
@@ -9,7 +9,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.biz.SalarySobBiz;
import com.engine.salary.biz.SalaryTemplateBiz;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryBill.bo.SalaryTemplateBO;
import com.engine.salary.entity.salaryBill.dto.SalaryTemplateListDTO;
import com.engine.salary.entity.salaryBill.dto.SalaryTemplateSalaryItemListDTO;
diff --git a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
index 149d31fb3..2aefb914c 100644
--- a/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
@@ -5,7 +5,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.biz.SpecialAddDeductionBiz;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.encrypt.EncryptUtil;
import com.engine.salary.entity.datacollection.AddUpDeduction;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
diff --git a/src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java b/src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java
index 883c886dd..e5c894fe9 100644
--- a/src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java
+++ b/src/com/engine/salary/service/impl/SysSalaryItemServiceImpl.java
@@ -4,7 +4,7 @@ import com.engine.core.impl.Service;
import com.engine.salary.biz.SalaryItemBiz;
import com.engine.salary.biz.SysSalaryItemBiz;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryitem.bo.SysSalaryItemBO;
import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
import com.engine.salary.entity.salaryitem.po.SysSalaryItemPO;
diff --git a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
index 1ec8469ab..24520a388 100644
--- a/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
@@ -6,7 +6,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
import com.engine.salary.constant.SalaryAuthConstant;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.AddUpDeduction;
import com.engine.salary.entity.datacollection.AddUpSituation;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
diff --git a/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
index 7528418f8..784433e6c 100644
--- a/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclarationExcelServiceImpl.java
@@ -3,7 +3,7 @@ package com.engine.salary.service.impl;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.taxagent.po.TaxAgentPO;
import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationAnnualListDTO;
import com.engine.salary.entity.taxdeclaration.dto.TaxDeclarationLaborListDTO;
diff --git a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
index 12c7de2f9..3327328ec 100644
--- a/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
+++ b/src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
@@ -4,7 +4,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.common.LocalDateRange;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryacct.po.SalaryAcctRecordPO;
import com.engine.salary.entity.salaryacct.po.SalaryAcctResultPO;
import com.engine.salary.entity.salaryitem.po.SalaryItemPO;
diff --git a/src/com/engine/salary/util/SalaryLoggerUtil.java b/src/com/engine/salary/util/SalaryLoggerUtil.java
index 6d35bd851..72d7aae28 100644
--- a/src/com/engine/salary/util/SalaryLoggerUtil.java
+++ b/src/com/engine/salary/util/SalaryLoggerUtil.java
@@ -1,8 +1,8 @@
package com.engine.salary.util;
-import com.engine.salary.elog.entity.dto.LoggerContext;
-import com.engine.salary.elog.util.LoggerTemplate;
+import com.engine.hrmelog.entity.dto.LoggerContext;
+import com.engine.hrmelog.util.LoggerTemplate;
import com.engine.salary.enums.OperateTypeEnum;
import weaver.hrm.User;
diff --git a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
index 8b1ff0f6e..dbc26d470 100644
--- a/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryArchiveItemWrapper.java
@@ -3,7 +3,7 @@ package com.engine.salary.wrapper;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveItemFormDTO;
import com.engine.salary.entity.salaryarchive.dto.SalaryItemAdjustRecordListDTO;
diff --git a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
index 83f728b23..22a642feb 100644
--- a/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryArchiveWrapper.java
@@ -6,7 +6,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.component.SalaryWeaTable;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.datacollection.DataCollectionEmployee;
import com.engine.salary.entity.salaryarchive.bo.SalaryArchiveBO;
import com.engine.salary.entity.salaryarchive.dto.SalaryArchiveBaseInfoFormDTO;
diff --git a/src/com/engine/salary/wrapper/SalaryFieldWrapper.java b/src/com/engine/salary/wrapper/SalaryFieldWrapper.java
index 5edef7f36..462b015d3 100644
--- a/src/com/engine/salary/wrapper/SalaryFieldWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryFieldWrapper.java
@@ -3,7 +3,7 @@ package com.engine.salary.wrapper;
import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryformula.ExpressFormula;
import com.engine.salary.entity.salaryitem.bo.SalaryItemBO;
import com.engine.salary.entity.salaryitem.dto.SalaryFieldListDTO;
diff --git a/src/com/engine/salary/wrapper/SalaryItemWrapper.java b/src/com/engine/salary/wrapper/SalaryItemWrapper.java
index 12e333331..d5693105c 100644
--- a/src/com/engine/salary/wrapper/SalaryItemWrapper.java
+++ b/src/com/engine/salary/wrapper/SalaryItemWrapper.java
@@ -4,7 +4,7 @@ import com.engine.common.util.ServiceUtil;
import com.engine.core.impl.Service;
import com.engine.salary.component.WeaFormOption;
import com.engine.salary.config.SalaryElogConfig;
-import com.engine.salary.elog.entity.dto.LoggerContext;
+import com.engine.hrmelog.entity.dto.LoggerContext;
import com.engine.salary.entity.salaryformula.ExpressFormula;
import com.engine.salary.entity.salaryitem.bo.SalaryItemBO;
import com.engine.salary.entity.salaryitem.bo.SysSalaryItemBO;