薪酬后端
Go to file
Harryxzy f3f814a145 Merge branch 'release/个税版本' into custom/艾志工业
# Conflicts:
#	src/com/engine/salary/biz/EmployBiz.java
#	src/com/engine/salary/entity/salaryarchive/bo/SalaryArchiveExcelBO.java
#	src/com/engine/salary/service/AddUpSituationService.java
#	src/com/engine/salary/service/impl/AddUpSituationServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryArchiveExcelServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryArchiveServiceImpl.java
#	src/com/engine/salary/service/impl/TaxDeclareRecordServiceImpl.java
#	src/com/engine/salary/web/AddUpSituationController.java
#	src/com/engine/salary/wrapper/AddUpSituationWrapper.java
2024-08-08 17:50:16 +08:00
resource Merge branch 'release/个税版本' into custom/艾志工业 2024-08-08 17:50:16 +08:00
src/com Merge branch 'release/个税版本' into custom/艾志工业 2024-08-08 17:50:16 +08:00
test 恢复对比功能 2024-07-23 10:14:58 +08:00
.gitignore 福利台账导出及列表bug修复 2022-04-19 17:46:24 +08:00