qt
/
weaver-hrm-salary
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
weaver-hrm-salary/src/com/engine/salary
History
钱涛 3a79ed9574 Merge branch 'release/2.11.2.2403.01' into release/个税版本 
# Conflicts:
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/SpecialAddDeductionServiceImpl.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
 		2024-03-15 15:44:15 +08:00
..
action 薪酬系统-福利档案，复制action功能优化 2024-01-30 15:58:42 +08:00
annotation 国际化注解 2024-03-11 16:50:47 +08:00
biz 考勤导入，多语言 2024-03-14 18:16:20 +08:00
cache 账套薪资项目添加code 2023-08-23 16:49:45 +08:00
cmd 薪酬系统-福利档案，SIArchivesBiz方法迁移到对应是实现类，并修改调用方相关代码 2024-02-02 15:23:26 +08:00
common 导出 2023-08-24 11:36:17 +08:00
component 去除pagehelper jar包 2024-02-26 16:25:17 +08:00
config 切换了elog位置 2024-03-12 14:34:44 +08:00
constant Merge branch 'release/2.11.2.2403.01' into release/个税版本 2024-03-15 15:44:15 +08:00
encrypt 去除无效代码 2023-11-07 20:14:23 +08:00
entity Merge branch 'release/2.11.2.2403.01' into release/个税版本 2024-03-15 15:44:15 +08:00
enums Merge branch 'release/2.11.1.2402.01' into release/个税版本 2024-03-06 15:54:07 +08:00
exception 1、核算接口代理 2022-08-01 14:15:09 +08:00
formlua Merge branch 'release/2.11.2.2403.01' into release/个税版本 2024-03-15 15:44:15 +08:00
handle jar引用变更 2023-02-21 14:33:15 +08:00
maintainer Merge branch 'release/2.11.1.2402.01' into release/个税版本 2024-03-06 15:54:07 +08:00
mapper Merge branch 'release/2.11.2.2403.01' into release/个税版本 2024-03-15 15:44:15 +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 申报表对比功能 2024-01-18 09:54:56 +08:00
report Merge branch 'release/3.0.0.2403.01' into release/个税版本 2024-03-12 18:56:12 +08:00
service Merge branch 'release/2.11.2.2403.01' into release/个税版本 2024-03-15 15:44:15 +08:00
sys Merge branch 'release/2.11.2.2403.01' into release/个税版本 2024-03-15 15:44:15 +08:00
timer 同步社保、薪资档案起始发薪日为入职日定时任务 2024-03-14 14:05:36 +08:00
transmethod 统一解密位置 2023-10-31 17:16:48 +08:00
util Merge branch 'release/3.0.0.2403.01' into release/个税版本 2024-03-12 18:56:12 +08:00
web Merge branch 'release/2.11.2.2403.01' into release/个税版本 2024-03-15 15:44:15 +08:00
wrapper Merge branch 'release/2.11.2.2403.01' into release/个税版本 2024-03-15 15:44:15 +08:00