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
..
bo	薪酬系统-多语言， 合并231102产品分支代码，并处理冲突	2023-12-01 12:46:43 +08:00
dto	薪酬系统-多语言，翻译部分中文表述，并更新多语言译文sql脚本，修复工资单详情页显示，修复薪酬报表显示	2023-10-11 17:17:19 +08:00
param	Merge remote-tracking branch 'remotes/origin/release/2.9.9.2312.01' into feature/salary_i18	2023-12-13 11:43:53 +08:00
po	薪酬系统-多语言，薪资项目、薪资项目分组更改名称获取逻辑（适配多语言）	2023-11-14 13:49:10 +08:00