sy 538633ece0 Merge remote-tracking branch 'remotes/origin/release/2.9.9.2312.01' into feature/salary_i18 ... # Conflicts: # src/com/engine/salary/biz/SIAccountBiz.java # src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java # src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java # src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java # src/com/engine/salary/entity/salarysob/bo/SalarySobItemAggregateBO.java # src/com/engine/salary/service/impl/SIAccountServiceImpl.java # src/com/engine/salary/service/impl/SIRepairServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctExcelServiceImpl.java # src/com/engine/salary/util/page/SalaryPageUtil.java # src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java		2023-12-13 11:43:53 +08:00
..
agency	薪酬系统-多语言，翻译部分中文表述，并更新多语言译文sql脚本，修复工资单详情页显示，修复薪酬报表显示	2023-10-11 17:17:19 +08:00
datacollection	薪酬系统-多语言，补缴逻辑优化，自定义福利名称、薪资项目名称重名校验逻辑优化	2023-12-11 14:24:45 +08:00
extemp	Merge remote-tracking branch 'remotes/origin/release/2.9.3.2308.01' into feature/salary_i18	2023-08-14 10:01:21 +08:00
hrm	人员属性扩展	2023-11-07 19:06:43 +08:00
process/dto	调薪流程按钮	2022-08-24 20:00:57 +08:00
progress	公共进度条功能	2023-06-06 10:30:49 +08:00
report	Merge branch 'feature/加密方法&分页merge' into feature/V3-backItem-1215	2022-12-14 12:21:42 +08:00
salaryBill	Merge remote-tracking branch 'remotes/origin/release/2.9.8.2311.02' into feature/salary_i18	2023-11-30 16:48:22 +08:00
salaryacct	Merge remote-tracking branch 'remotes/origin/release/2.9.9.2312.01' into feature/salary_i18	2023-12-13 11:43:53 +08:00
salaryarchive	Merge remote-tracking branch 'remotes/origin/release/2.9.8.2311.02' into feature/salary_i18	2023-11-30 16:48:22 +08:00
salaryformula	薪酬系统-多语言，补缴逻辑优化，自定义福利名称、薪资项目名称重名校验逻辑优化	2023-12-11 14:24:45 +08:00
salaryitem	Merge remote-tracking branch 'remotes/origin/release/2.9.9.2312.01' into feature/salary_i18	2023-12-13 11:43:53 +08:00
salarysob	Merge remote-tracking branch 'remotes/origin/release/2.9.9.2312.01' into feature/salary_i18	2023-12-13 11:43:53 +08:00
salarysql	线下对比	2022-04-26 16:39:41 +08:00
siaccount	Merge remote-tracking branch 'remotes/origin/release/2.9.9.2312.01' into feature/salary_i18	2023-12-13 11:43:53 +08:00
siarchives	薪酬系统-福利档案，福利档案基数调整记录列表查询入参调整	2023-10-23 18:07:37 +08:00
sicategory	薪酬系统-多语言，福利险种更改险种名称获取逻辑（适配多语言）	2023-11-13 16:47:44 +08:00
siexport	薪酬系统-福利台账，核算明细列表合计行导出	2023-08-18 17:58:36 +08:00
sischeme	薪酬系统-多语言，翻译部分中文表述，并更新多语言译文sql脚本，修复工资单详情页显示，修复薪酬报表显示	2023-10-11 17:17:19 +08:00
taxagent	薪酬系统-多语言，翻译部分中文表述，并更新多语言译文sql脚本，修复工资单详情页显示，修复薪酬报表显示	2023-10-11 17:17:19 +08:00
taxdeclaration	薪酬系统-多语言，翻译部分中文表述，并更新多语言译文sql脚本，修复工资单详情页显示，修复薪酬报表显示	2023-10-11 17:17:19 +08:00
taxrate	薪酬系统-国际化，转义调用使用带有language字段的方法，并处理相关逻辑	2023-06-21 14:51:41 +08:00