Harryxzy 558304043c Merge branch 'release/2.16.1.2410.01' into custom/宁波精华 ... # Conflicts: # src/com/engine/salary/entity/salaryacct/bo/SalaryAcctResultBO.java # src/com/engine/salary/entity/salaryacct/po/SalaryAcctEmployeePO.java # src/com/engine/salary/mapper/datacollection/EmployMapper.java # src/com/engine/salary/mapper/datacollection/EmployMapper.xml # src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.java # src/com/engine/salary/mapper/salaryacct/SalaryAcctEmployeeMapper.xml # src/com/engine/salary/mapper/taxagent/TaxAgentMapper.java # src/com/engine/salary/mapper/taxagent/TaxAgentMapper.xml # src/com/engine/salary/service/SalaryAcctEmployeeService.java # src/com/engine/salary/service/SalaryEmployeeService.java # src/com/engine/salary/service/TaxAgentService.java # src/com/engine/salary/service/impl/SalaryAcctEmployeeServiceImpl.java # src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java # src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java # src/com/engine/salary/service/impl/TaxAgentServiceImpl.java		2024-10-18 17:11:03 +08:00
..
bo	1、支持获取班次信息	2024-09-18 15:59:36 +08:00
dto	修改浮动数据扣缴义务人id类型	2024-09-27 11:13:00 +08:00
param	Merge remote-tracking branch 'origin/feature/240801-浮动薪资' into feature/240801-浮动薪资	2024-08-16 14:04:31 +08:00
po	浮动薪酬	2024-10-14 10:38:30 +08:00
AddUpDeduction.java	切换了elog位置	2024-03-12 14:34:44 +08:00
AddUpSituation.java	切换了elog位置	2024-03-12 14:34:44 +08:00
DataCollectionEmployee.java	宁波精华社保管理员	2024-07-22 10:08:04 +08:00