钱涛 0856f63ca5 Merge branch 'release/2.9.10.2312.02' into release/个税版本 ... # Conflicts: # src/com/engine/salary/util/page/SalaryPageUtil.java		2023-12-14 10:41:37 +08:00
..
action	核算记录归档action	2023-12-13 09:58:00 +08:00
annotation	加密方法	2022-12-12 09:37:15 +08:00
biz	薪酬系统-福利核算，对于处于在缴员工列表，但是不在起始缴纳月和最后缴纳月区间的核算月的人员，不生成核算记录	2023-11-22 16:47:36 +08:00
cache	账套薪资项目添加code	2023-08-23 16:49:45 +08:00
cmd	xzy-解决社保福利方案删除时校验问题	2022-08-18 12:26:53 +08:00
common	导出	2023-08-24 11:36:17 +08:00
component	核算结果导出数值项excel格式为数值	2023-09-21 13:36:23 +08:00
constant	Merge branch 'release/2.9.6.2310.01' into release/个税版本	2023-10-08 14:21:25 +08:00
encrypt	去除无效代码	2023-11-07 20:14:23 +08:00
entity	Merge branch 'release/2.9.10.2312.02' into release/个税版本	2023-12-14 10:41:37 +08:00
enums	Merge branch 'release/2.9.9.2312.01' into release/个税版本	2023-11-29 17:46:31 +08:00
exception	1、核算接口代理	2022-08-01 14:15:09 +08:00
formlua	Merge branch 'release/3.0.0.2311.01' into release/个税版本	2023-10-31 17:19:09 +08:00
handle	jar引用变更	2023-02-21 14:33:15 +08:00
maintainer	同步所有人员报送发薪日期为入职日期	2023-12-05 17:08:35 +08:00
mapper	修复人员信息无法置空问题	2023-12-05 17:17:11 +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	导出申报明细	2023-12-08 18:15:56 +08:00
report	Merge branch 'release/2.9.10.2312.02' into release/个税版本	2023-12-14 10:41:37 +08:00
service	Merge branch 'release/2.9.10.2312.02' into release/个税版本	2023-12-14 10:41:37 +08:00
sys	Merge branch 'release/2.9.9.2312.01' into release/个税版本	2023-12-05 15:09:40 +08:00
timer	同步义务人人员范围到账套人员范围	2023-10-16 16:59:18 +08:00
transmethod	统一解密位置	2023-10-31 17:16:48 +08:00
util	Merge branch 'release/2.9.10.2312.02' into release/个税版本	2023-12-14 10:41:37 +08:00
web	人员报送导入模板	2023-12-13 17:52:51 +08:00
wrapper	人员报送导入模板	2023-12-13 17:52:51 +08:00