fix冲突

This commit is contained in:
Harryxzy 2024-03-29 10:52:46 +08:00
parent 330d1363fc
commit 47e0f5da52
1 changed files with 0 additions and 5 deletions

View File

@ -21,7 +21,6 @@ import com.engine.salary.enums.UserStatusEnum;
import com.engine.salary.enums.datacollection.UseEmployeeTypeEnum;
import com.engine.salary.enums.salarysob.TargetTypeEnum;
import com.engine.salary.mapper.datacollection.EmployMapper;
import com.engine.salary.mapper.datacollection.EmployMapper;
import com.engine.salary.mapper.hrm.ExpandFieldSettingsMapper;
import com.engine.salary.mapper.sys.SalarySysConfMapper;
import com.engine.salary.service.ExtEmpService;
@ -68,10 +67,6 @@ public class SalaryEmployeeServiceImpl extends Service implements SalaryEmployee
return SqlProxyHandle.getProxy(SalarySysConfMapper.class);
}
private EmployMapper getEmployMapper() {
return SqlProxyHandle.getProxy(EmployMapper.class);
}
private ExpandFieldSettingsMapper getExpandFieldSettingsMapper() {
return SqlProxyHandle.getProxy(ExpandFieldSettingsMapper.class);