sy b5eeb97d3d Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18 ... # Conflicts: # src/com/engine/salary/biz/SIAccountBiz.java # src/com/engine/salary/biz/SIArchivesBiz.java # src/com/engine/salary/entity/salaryBill/bo/SalaryTemplateBO.java # src/com/engine/salary/entity/salaryBill/param/SalarySendWithdrawParam.java # src/com/engine/salary/entity/salaryBill/param/SalaryTemplateSaveParam.java # src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java # src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java # src/com/engine/salary/entity/salaryitem/bo/SalaryItemBO.java # src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java # src/com/engine/salary/enums/salaryformula/SalaryFormulaReferenceEnum.java # src/com/engine/salary/maintainer/salaryacct/SalaryAcctManager.java # src/com/engine/salary/report/enums/UnitTypeEnum.java # src/com/engine/salary/report/service/impl/SalaryStatisticsReportServiceImpl.java # src/com/engine/salary/report/wrapper/SalaryStatisticsDimensionWrapper.java # src/com/engine/salary/report/wrapper/SalaryStatisticsReportWrapper.java # src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java # src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java # src/com/engine/salary/service/impl/RecordsBuildServiceImpl.java # src/com/engine/salary/service/impl/SISchemeServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctProgressServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java # src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java # src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java # src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java # src/com/engine/salary/service/impl/SalarySendServiceImpl.java # src/com/engine/salary/service/impl/SalaryTemplateServiceImpl.java # src/com/engine/salary/web/SalaryAcctController.java # src/com/engine/salary/web/SalaryFormulaController.java # src/com/engine/salary/web/SalaryProgressController.java # src/com/engine/salary/web/SalarySobController.java # src/com/engine/salary/wrapper/SalaryAcctResultWrapper.java # src/com/engine/salary/wrapper/SalarySobItemWrapper.java		2023-06-30 11:37:39 +08:00
..
AddUpDeductionServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
AddUpSituationServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
AttendQuoteDataServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
AttendQuoteFieldServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
AttendQuoteFieldSettingServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
AttendQuoteServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
ColumnBuildServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
FormulaRunServiceImpl.java	核算异常信息	2023-05-17 17:38:12 +08:00
OtherDeductionServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
ProgressServiceImpl.java	修复进度条	2023-06-29 13:38:07 +08:00
RecordsBuildServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
RemoteExcelServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
SIAComparisonResultServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SIAccountServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SIArchivesServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SIBalanceServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SICategoryServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SICompensationServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SIExportServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
SIImportServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
SIRecessionServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
SIRepairServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SIReportServiceImpl.java	Merge branch 'feature/变更分页' into feature/加密方法&分页merge	2022-12-14 10:57:41 +08:00
SISchemeServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
SalaryAcctCalcServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SalaryAcctCalculateServiceImpl.java	公共进度条功能	2023-06-06 10:30:49 +08:00
SalaryAcctEmployeeServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
SalaryAcctExcelServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
SalaryAcctProgressServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
SalaryAcctRecordServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
SalaryAcctReportServiceImpl.java	feat: 加密统一,薪资项目&社保档案详情...	2022-12-13 17:14:27 +08:00
SalaryAcctResultLogServiceImpl.java	薪资核算结果编辑导入 记录	2023-05-15 10:28:17 +08:00
SalaryAcctResultServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
SalaryAcctResultTempServiceImpl.java	处理sqlserver参数过多异常	2022-05-25 17:15:16 +08:00
SalaryArchiveExcelServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
SalaryArchiveItemServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SalaryArchiveServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
SalaryArchiveTaxAgentServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SalaryBillBaseSetServiceImpl.java	系统默认水印	2023-06-16 09:58:54 +08:00
SalaryBillServiceImpl.java	系统默认水印	2023-06-16 09:58:54 +08:00
SalaryBillWatermarkServiceImpl.java	暂存	2023-06-09 17:57:17 +08:00
SalaryCacheServiceImpl.java	缓存类	2022-11-23 18:36:33 +08:00
SalaryComparisonResultServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SalaryEmployeeServiceImpl.java	自定义报表	2023-04-14 15:18:18 +08:00
SalaryFormulaServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
SalaryItemServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
SalarySendRangeObjServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SalarySendRangeServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SalarySendServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
SalarySobAdjustRuleServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SalarySobBackItemServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SalarySobCheckRuleServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SalarySobDefaultEmpFieldServiceImpl.java	短信邮件	2023-05-08 09:27:20 +08:00
SalarySobDefaultItemServiceImpl.java	相对更新	2022-03-24 16:59:52 +08:00
SalarySobEmpFieldServiceImpl.java	账套群组保持不变	2023-02-09 15:33:35 +08:00
SalarySobItemGroupServiceImpl.java	xzy-薪资项目显隐控制	2022-08-24 10:31:42 +08:00
SalarySobItemHideServiceImpl.java	xzy-薪资项目显隐控制	2022-08-24 10:31:42 +08:00
SalarySobItemServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SalarySobRangeServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SalarySobServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
SalaryTemplateServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
SpecialAddDeductionServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
SysSalaryItemServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
TaxAgentAdminServiceImpl.java	考勤和申报表的分权	2022-06-07 15:43:22 +08:00
TaxAgentBaseServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
TaxAgentEmpChangeServiceImpl.java	分片删除	2022-11-02 20:10:16 +08:00
TaxAgentEmpServiceImpl.java	fix人员同步	2022-06-15 09:29:43 +08:00
TaxAgentExcelServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
TaxAgentManageRangeServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
TaxAgentServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
TaxDeclarationDetailServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
TaxDeclarationExcelServiceImpl.java	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00
TaxDeclarationServiceImpl.java	Merge remote-tracking branch 'remotes/origin/master' into feature/salary_i18	2023-06-30 11:37:39 +08:00
TaxRateBaseServiceImpl.java	核算基础公式	2022-04-11 20:46:25 +08:00
TaxRateDetailServiceImpl.java	核算基础公式	2022-04-11 20:46:25 +08:00