Harryxzy 8c1caebdaf Merge branch 'feature/240701-社保管理员' into custom/宁波精华 ... # Conflicts: # src/com/engine/salary/entity/taxagent/po/TaxAgentAdminPO.java # src/com/engine/salary/mapper/archive/SalaryArchiveMapper.java # src/com/engine/salary/mapper/salarysob/SalarySobMapper.xml # src/com/engine/salary/mapper/taxagent/TaxAgentAdminMapper.xml # src/com/engine/salary/service/TaxAgentAdminService.java # src/com/engine/salary/service/impl/TaxAgentAdminServiceImpl.java # src/com/engine/salary/service/impl/TaxAgentServiceImpl.java # src/com/engine/salary/wrapper/TaxAgentWrapper.java		2024-07-17 18:18:39 +08:00
..
archive	Merge branch 'feature/240701-社保管理员' into custom/宁波精华	2024-07-17 18:18:39 +08:00
datacollection	Merge branch 'release/2.14.5.2406.03' into custom/宁波精华	2024-07-02 10:18:47 +08:00
extemp	非系统人员部门id、分部id删除失败	2024-04-12 15:06:32 +08:00
formula	公式删除校验	2023-02-23 15:48:18 +08:00
hrm	修改关键字	2023-11-07 11:00:00 +08:00
report	添加账套筛选条件	2024-02-28 14:43:27 +08:00
salaryacct	修复oracle bug	2024-07-11 16:30:00 +08:00
salarybill	多部门多分部筛选	2024-03-21 14:19:03 +08:00
salaryitem	map映射	2024-06-20 17:08:01 +08:00
salarysob	修复sql隐藏bug	2024-07-03 18:00:29 +08:00
siaccount	优化 - 社保福利台账小数位数	2024-06-05 15:30:57 +08:00
siarchives	社保福利通过证件号码导入	2024-05-29 15:32:19 +08:00
sicategory	薪酬系统-福利方案，自定义福利项删除	2023-07-25 16:17:24 +08:00
sischeme	薪酬系统-福利方案，方案新建、复制、删除功能增加操作日志	2024-02-05 14:06:52 +08:00
sys	工资单确认反馈	2023-07-12 15:17:59 +08:00
taxagent	社保管理员temp	2024-07-17 18:05:37 +08:00
taxdeclaration	撤回个税申报	2023-06-12 10:40:01 +08:00
InsuranceExportMapper.java	薪酬系统-福利档案，非系统人员tab页列表	2023-09-06 10:04:58 +08:00
InsuranceExportMapper.xml	社保福利通过证件号码导入	2024-05-29 15:32:19 +08:00
SysTaxRateBaseMapper.java	去除Spring注解	2022-07-06 17:36:30 +08:00
SysTaxRateBaseMapper.xml	oracle适配	2022-05-30 11:51:00 +08:00
SysTaxRateDetailMapper.java	去除Spring注解	2022-07-06 17:36:30 +08:00
SysTaxRateDetailMapper.xml	核算基础公式	2022-04-11 20:17:47 +08:00
TaxRateBaseMapper.java	去除Spring注解	2022-07-06 17:36:30 +08:00
TaxRateBaseMapper.xml	oracle适配	2022-05-30 11:51:00 +08:00
TaxRateDetailMapper.java	去除Spring注解	2022-07-06 17:36:30 +08:00
TaxRateDetailMapper.xml	oracle适配	2022-05-30 11:51:00 +08:00