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	Merge remote-tracking branch 'remotes/origin/release/2.9.8.2311.02' into feature/salary_i18	2023-11-30 16:48:22 +08:00
dto	薪酬系统-多语言，翻译部分中文表述，并更新多语言译文sql脚本，修复工资单详情页显示，修复薪酬报表显示	2023-10-11 17:17:19 +08:00
param	薪酬系统-福利台账，台账查询增加个税扣缴义务人	2023-11-27 11:20:36 +08:00
po	feat: 加密统一,薪资项目&社保档案详情...	2022-12-13 17:14:27 +08:00