Harryxzy 5918de016e Merge branch 'feature/salalryItemAndFieldSort' into release/2.9.1.2307.01 ... # Conflicts: # src/com/engine/salary/service/impl/SalaryItemServiceImpl.java		2023-07-11 13:24:37 +08:00
..
action	停薪action	2023-06-15 15:23:54 +08:00
annotation	加密方法	2022-12-12 09:37:15 +08:00
biz	Merge branch 'fix/230701修复项目添加时名称校验问题' into release/2.9.1.2307.01	2023-07-11 11:08:39 +08:00
cache	Merge branch 'feature/短信验证码' into release/2.8.4.2306.02	2023-06-26 13:54:56 +08:00
cmd	xzy-解决社保福利方案删除时校验问题	2022-08-18 12:26:53 +08:00
common	薪酬上下文	2023-04-13 11:53:43 +08:00
component	维度统计管理判断能否删除和编辑	2023-05-24 14:17:31 +08:00
constant	暂存	2023-06-09 17:57:17 +08:00
encrypt	Merge branch 'feature/个人养老金' into release/2.7.3.2304.01	2023-04-13 09:35:29 +08:00
entity	Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01	2023-07-11 11:11:15 +08:00
enums	工资单定时发送 添加 发放周期	2023-07-04 18:03:57 +08:00
exception	1、核算接口代理	2022-08-01 14:15:09 +08:00
formlua	显示字段管理默认使用列	2023-06-01 11:05:15 +08:00
handle	jar引用变更	2023-02-21 14:33:15 +08:00
maintainer	非系统算税功能	2023-07-04 09:32:12 +08:00
mapper	Merge branch 'fix/230701修复项目添加时名称校验问题' into release/2.9.1.2307.01	2023-07-11 11:08:39 +08:00
process	调薪说明	2023-02-22 19:07:13 +08:00
remote/attend	公式	2023-04-19 13:35:35 +08:00
report	报表缓存时参数变更问题	2023-06-27 16:18:42 +08:00
service	Merge branch 'feature/salalryItemAndFieldSort' into release/2.9.1.2307.01	2023-07-11 13:24:37 +08:00
sys	Merge branch 'feature/taxDeclarationWithdraw' into release/2.9.1.2307.01	2023-07-10 11:10:10 +08:00
timer	工资单定时发送 添加 发放周期	2023-07-05 10:36:02 +08:00
transmethod	描述异常	2022-07-13 11:45:16 +08:00
util	修复同步档案bug	2023-06-15 10:44:31 +08:00
web	Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01	2023-07-11 11:31:29 +08:00
wrapper	Merge branch 'feature/taxDeclarationWithdraw' into release/2.9.1.2307.01	2023-07-10 11:10:10 +08:00