钱涛 405efdc55e Merge branch 'release/3.0.2.2504.01' into custom/汇通建设集团 ... # Conflicts: # resource/WEB-INF/prop/hrmSalary.properties # src/com/engine/salary/entity/salaryacct/po/SalaryAcctRecordPO.java # src/com/engine/salary/service/SIAccountService.java # src/com/engine/salary/service/SalaryAcctResultService.java # src/com/engine/salary/service/impl/SIAccountServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctCalculateServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java # src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java		2025-12-16 10:40:32 +08:00
..
action	Merge branch 'release/3.0.2.2504.01' into custom/汇通建设集团	2025-12-16 10:40:32 +08:00
annotation	核算和账套的权限	2024-08-28 17:55:42 +08:00
biz	Merge branch 'release/2.19.1.2501.01' into release/3.0.2.2504.01	2025-04-17 14:24:23 +08:00
cache	导入工具明细	2024-08-16 11:18:27 +08:00
cmd	修复社保福利新建时没有小数位和进位规则对应问题	2024-05-08 10:49:08 +08:00
common	导入往期累计	2024-09-13 17:32:15 +08:00
component	去除pagehelper jar包	2024-02-26 16:25:17 +08:00
config	业务线操作日志	2024-09-24 10:19:06 +08:00
constant	Merge branch 'release/2.15.2.2409.01' into feature/权限	2024-09-13 17:32:58 +08:00
encrypt	人员id加密	2024-09-18 18:10:30 +08:00
entity	Merge branch 'release/3.0.2.2504.01' into custom/汇通建设集团	2025-12-16 10:40:32 +08:00
enums	数据推送	2025-04-07 09:19:47 +08:00
exception	1、核算接口代理	2022-08-01 14:15:09 +08:00
formlua	处理8位小数问题	2024-06-28 14:42:23 +08:00
handle	模板权限	2024-12-02 15:01:06 +08:00
maintainer	支持根据税款所属期进行申报	2025-02-07 16:58:58 +08:00
mapper	Merge branch 'release/3.0.2.2504.01' into custom/汇通建设集团	2025-12-16 10:40:32 +08:00
process	Merge remote-tracking branch 'remotes/origin/feature/230901-福利台账-调差，支持一个人存在多个调差记录' into release/2.9.5.2309.01	2023-09-21 14:09:54 +08:00
remote	Merge branch 'release/2.18.2.2412.02' into feature/数据推送	2024-12-27 09:24:22 +08:00
report	Merge branch 'release/3.0.2.2504.01' into custom/汇通建设集团	2025-12-16 10:40:32 +08:00
service	Merge branch 'release/3.0.2.2504.01' into custom/汇通建设集团	2025-12-16 10:40:32 +08:00
sys	核算是否采用线程池配置	2025-03-19 18:08:19 +08:00
timer	Merge branch 'release/2.19.1.2501.01' into release/3.0.1.2503.01	2025-03-19 10:09:28 +08:00
transmethod	统一解密位置	2023-10-31 17:16:48 +08:00
util	Merge branch 'release/3.0.2.2504.01' into custom/汇通建设集团	2025-12-16 10:40:32 +08:00
web	Merge branch 'release/3.0.2.2504.01' into custom/汇通建设集团	2025-12-16 10:40:32 +08:00
wrapper	Merge branch 'release/3.0.2.2504.01' into custom/汇通建设集团	2025-12-16 10:40:32 +08:00