Harryxzy 59d3aa758d Merge branch 'release/个税版本' into custom/艾志工业-个税申报 ... # Conflicts: # src/com/engine/salary/service/SalaryArchiveService.java # src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java		2023-09-12 11:19:30 +08:00
..
action	薪酬系统-福利档案，福利档案减员、增员action	2023-08-23 16:52:32 +08:00
annotation	加密方法	2022-12-12 09:37:15 +08:00
biz	Merge remote-tracking branch 'remotes/origin/feature/230901-福利档案-非系统人员tab' into release/2.9.5.2309.01	2023-09-08 17:02:03 +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	维度统计管理判断能否删除和编辑	2023-05-24 14:17:31 +08:00
constant	新增往期累计字段	2023-09-05 11:04:53 +08:00
encrypt	Merge branch 'feature/个人养老金' into release/2.7.3.2304.01	2023-04-13 09:35:29 +08:00
entity	Merge branch 'release/个税版本' into custom/艾志工业-个税申报	2023-09-12 11:19:30 +08:00
enums	在线获取累计专项附加扣除	2023-09-04 09:29:00 +08:00
exception	1、核算接口代理	2022-08-01 14:15:09 +08:00
formlua	Merge branch 'release/2.9.4.2308.02' into custom/艾志工业-个税申报	2023-09-04 13:06:33 +08:00
handle	jar引用变更	2023-02-21 14:33:15 +08:00
maintainer	有向无环拓扑排序	2023-09-07 15:15:59 +08:00
mapper	Merge branch 'release/个税版本' into custom/艾志工业-个税申报	2023-09-12 11:19:30 +08:00
process	调薪说明	2023-02-22 19:07:13 +08:00
remote/attend	公式	2023-04-19 13:35:35 +08:00
report	核算优先级	2023-09-06 14:01:56 +08:00
service	Merge branch 'release/个税版本' into custom/艾志工业-个税申报	2023-09-12 11:19:30 +08:00
sys	申报表加解密	2023-08-25 17:37:39 +08:00
timer	Merge branch 'release/2.9.4.2308.02' into custom/艾志工业-个税申报	2023-09-04 13:06:33 +08:00
transmethod	描述异常	2022-07-13 11:45:16 +08:00
util	Merge branch 'release/2.9.4.2308.02' into custom/艾志工业-个税申报	2023-09-04 13:06:33 +08:00
web	Merge branch 'release/个税版本' into custom/艾志工业-个税申报	2023-09-12 11:19:30 +08:00
wrapper	Merge branch 'release/个税版本' into custom/艾志工业-个税申报	2023-09-12 11:19:30 +08:00