钱涛 9adafca446 Merge branch 'release/2.19.1.2501.01' into release/个税版本 ... # Conflicts: # src/com/engine/salary/entity/taxdeclaration/param/TaxDeclarationSaveParam.java # src/com/engine/salary/maintainer/datacollection/AddUpSituationManager.java # src/com/engine/salary/service/impl/TaxDeclarationServiceImpl.java # src/com/engine/salary/wrapper/SalaryCommonWrapper.java		2025-02-08 15:50:39 +08:00
..
common/constant	核算优先级	2023-09-06 14:01:56 +08:00
entity	报表增加岗位筛选	2024-09-14 15:33:31 +08:00
enums	自定义报表维度	2023-11-06 18:46:49 +08:00
service	fix 报表按照分部维度错误	2024-12-24 15:39:58 +08:00
util	删除sql，修改签名	2023-05-05 14:08:37 +08:00
web	自定义列全局设置	2024-10-11 15:34:17 +08:00
wrapper	Merge branch 'release/2.19.1.2501.01' into release/个税版本	2025-02-08 15:50:39 +08:00