钱涛 f3577d3ddd Merge branch 'feature/数据推送' into release/个税&业务线 ... # Conflicts: # src/com/engine/salary/constant/SalaryDefaultTenantConstant.java # src/com/engine/salary/entity/datacollection/po/OtherDeductionPO.java # src/com/engine/salary/entity/salarysob/param/SalarySobListQueryParam.java # src/com/engine/salary/mapper/datacollection/EmployMapper.java # src/com/engine/salary/mapper/datacollection/EmployMapper.xml # src/com/engine/salary/service/AddUpDeductionService.java # src/com/engine/salary/service/OtherDeductionService.java # src/com/engine/salary/service/impl/AddUpDeductionServiceImpl.java # src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java # src/com/engine/salary/service/impl/OtherDeductionServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctRecordServiceImpl.java # src/com/engine/salary/service/impl/SalarySobServiceImpl.java # src/com/engine/salary/web/SalarySobController.java # src/com/engine/salary/wrapper/SalarySobWrapper.java		2025-02-12 14:00:43 +08:00
..
action	action 增加enableField字段值wei	2024-11-19 13:35:25 +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 feature/数据推送	2025-02-12 13:31:54 +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 'feature/数据推送' into release/个税&业务线	2025-02-12 14:00:43 +08:00
enums	Merge branch 'feature/数据推送' into release/个税&业务线	2025-02-12 14:00:43 +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 'feature/数据推送' into release/个税&业务线	2025-02-12 14:00:43 +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 'feature/数据推送' into release/个税&业务线	2025-02-12 14:00:43 +08:00
report	Merge branch 'feature/数据推送' into release/个税&业务线	2025-02-12 14:00:43 +08:00
service	Merge branch 'feature/数据推送' into release/个税&业务线	2025-02-12 14:00:43 +08:00
sys	Merge branch 'release/2.19.1.2501.01' into release/个税版本	2025-02-08 15:50:39 +08:00
timer	Merge branch 'release/2.18.2.2412.02' into feature/数据推送	2024-12-27 09:24:22 +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 'feature/数据推送' into release/个税&业务线	2025-02-12 14:00:43 +08:00
wrapper	Merge branch 'feature/数据推送' into release/个税&业务线	2025-02-12 14:00:43 +08:00