weaver-hrm-salary/src/com/engine/salary
钱涛 43d35cb81b Merge branch 'release/个税版本' into release/个税&业务线
# Conflicts:
#	src/com/engine/salary/entity/taxdeclaration/po/TaxDeclarationPO.java
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java
2025-04-24 11:07:01 +08:00
..
action 停薪action 增加日志 2025-03-12 18:21:04 +08:00
annotation Merge branch 'feature/数据推送' into release/个税&业务线 2025-02-12 14:00:43 +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 Merge branch 'release/2.15.1.2407.01' into release/个税版本 2024-08-23 10:08:08 +08:00
cmd 修复社保福利新建时没有小数位和进位规则对应问题 2024-05-08 10:49:08 +08:00
common Merge branch 'feature/数据推送' into release/个税&业务线 2025-02-12 14:00:43 +08:00
component 去除pagehelper jar包 2024-02-26 16:25:17 +08:00
config Merge branch 'feature/数据推送' into release/个税&业务线 2025-02-12 14:00:43 +08:00
constant Merge branch 'release/2.15.2.2409.01' into release/个税版本 2024-09-29 15:08:38 +08:00
encrypt 人员id加密 2024-09-18 18:10:30 +08:00
entity Merge branch 'release/个税版本' into release/个税&业务线 2025-04-24 11:07:01 +08:00
enums Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 2025-04-08 16:39:27 +08:00
exception 在线算税重试处理 2024-07-31 16:02:11 +08:00
formlua Merge branch 'release/2.14.5.2406.03' into release/个税版本 2024-07-10 17:05:06 +08:00
handle 模板权限 2024-12-02 15:01:06 +08:00
maintainer Merge branch 'release/2.19.1.2501.01' into release/个税版本 2025-02-08 15:50:39 +08:00
mapper Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 2025-04-24 09:15:35 +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/个税版本' into release/个税&业务线 2025-04-08 16:38:45 +08:00
report Merge branch 'release/3.0.1.2503.01' into release/个税&业务线 2025-03-26 15:48:02 +08:00
service Merge branch 'release/个税版本' into release/个税&业务线 2025-04-24 11:07:01 +08:00
sys Merge branch 'release/3.0.1.2503.01' into release/个税&业务线 2025-03-26 15:48:02 +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/2.19.1.2501.01' into release/个税版本 2025-02-08 15:50:39 +08:00
web Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 2025-04-24 09:15:35 +08:00
wrapper Merge branch 'release/3.0.2.2504.01' into release/个税&业务线 2025-04-21 14:27:00 +08:00