薪酬后端
Go to file
钱涛 1851457a6f Merge branch 'release/2.15.1.2407.01' into release/个税版本
# Conflicts:
#	src/com/engine/salary/enums/SalaryOnOffEnum.java
#	src/com/engine/salary/mapper/taxagent/TaxAgentMapper.java
#	src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml
#	src/com/engine/salary/service/SalarySobItemService.java
#	src/com/engine/salary/service/TaxAgentService.java
#	src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobItemServiceImpl.java
#	src/com/engine/salary/service/impl/SalarySobServiceImpl.java
#	src/com/engine/salary/service/impl/TaxAgentServiceImpl.java
#	src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
#	src/com/engine/salary/wrapper/SalaryCommonWrapper.java
2024-08-23 10:08:08 +08:00
resource Merge branch 'release/2.15.1.2407.01' into release/个税版本 2024-08-23 10:08:08 +08:00
src/com Merge branch 'release/2.15.1.2407.01' into release/个税版本 2024-08-23 10:08:08 +08:00
test 恢复对比功能 2024-07-23 10:14:58 +08:00
.gitignore 福利台账导出及列表bug修复 2022-04-19 17:46:24 +08:00