Commit Graph

15 Commits

Author SHA1 Message Date
钱涛 6ade625a39 Merge branch 'release/2.19.1.2501.01' into release/个税版本
# Conflicts:
#	src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
2025-03-31 13:31:33 +08:00
钱涛 b128f219f7 处理敏感信息泄露 2025-03-24 14:57:00 +08:00
钱涛 5f64acc269 Merge branch 'release/2.12.1.2403.02' into release/个税版本
# Conflicts:
#	src/com/engine/salary/mapper/datacollection/EmployMapper.java
#	src/com/engine/salary/mapper/datacollection/EmployMapper.xml
#	src/com/engine/salary/mapper/extemp/ExternalEmployeeMapper.java
#	src/com/engine/salary/service/ExtEmpService.java
#	src/com/engine/salary/service/SalaryEmployeeService.java
#	src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
#	src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
2024-03-29 14:37:00 +08:00
Harryxzy e3c528c649 薪资明细表 2024-03-25 16:08:34 +08:00
Harryxzy 3a9b772cb9 人员信息报送增加模糊查询 2024-02-27 15:16:13 +08:00
钱涛 b5f9477c90 流量监控 2023-08-28 13:31:11 +08:00
钱涛 988139610b Merge branch 'release/2.9.4.2308.02' into release/230803对接个税
# Conflicts:
#	src/com/engine/salary/mapper/salarysob/SalarySobItemMapper.xml
#	src/com/engine/salary/web/SalarySobController.java
2023-08-18 09:36:26 +08:00
钱涛 dc63897165 个税对接,个税申报接口 2023-08-11 14:20:14 +08:00
sy 80f4f7d43b 薪酬系统-非系统人员管理,非系统人员导入模板 2023-07-27 09:39:03 +08:00
钱涛 62d124efb1 外部人员终极版 2023-03-15 22:48:01 +08:00
钱涛 a61b7ac7bc 外部人员 2023-03-13 16:04:19 +08:00
Harryxzy 32b1a2db48 employeeService查询外部 2023-03-13 15:53:56 +08:00
钱涛 487dd9f972 非系统人员档案自动化 2023-03-08 16:36:47 +08:00
钱涛 a5596d503f 外部人员基础信息 2023-03-03 16:57:52 +08:00
钱涛 1568b1e03d 外部人员基础类 2023-03-01 09:05:03 +08:00