钱涛 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
..
EmployeeDeclare	同步所有人员报送发薪日期为入职日期	2023-12-05 17:08:35 +08:00
datacollection	Merge branch 'release/2.19.1.2501.01' into release/个税版本	2025-02-08 15:50:39 +08:00
salaryacct	Merge branch 'release/2.16.1.2410.01' into release/个税版本	2024-10-18 11:08:18 +08:00
salaryarchive	同步所有人员报送发薪日期为入职日期	2023-12-05 17:08:35 +08:00
MaintainerController.java	同步所有人员报送发薪日期为入职日期	2023-12-05 17:08:35 +08:00