Harryxzy
|
ff33397326
|
港湾报表
|
2024-07-05 09:24:17 +08:00 |
sy
|
05fd1a0e71
|
Merge remote-tracking branch 'remotes/origin/release/2.9.6.2310.01' into feature/salary_i18
# Conflicts:
# src/com/engine/salary/biz/SIAccountBiz.java
# src/com/engine/salary/biz/SIArchivesBiz.java
# src/com/engine/salary/biz/SISchemeBiz.java
# src/com/engine/salary/entity/salaryBill/bo/SalaryBillBO.java
# src/com/engine/salary/entity/salaryBill/param/SalaryBaseSetSaveParam.java
# src/com/engine/salary/enums/salaryformula/SalarySQLReferenceEnum.java
# src/com/engine/salary/enums/salarysob/SalaryEmployeeStatusEnum.java
# src/com/engine/salary/service/impl/ColumnBuildServiceImpl.java
# src/com/engine/salary/service/impl/ExtEmpServiceImpl.java
# src/com/engine/salary/service/impl/SIAComparisonResultServiceImpl.java
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
# src/com/engine/salary/service/impl/SICompensationServiceImpl.java
# src/com/engine/salary/service/impl/SIExportServiceImpl.java
# src/com/engine/salary/service/impl/SIImportServiceImpl.java
# src/com/engine/salary/service/impl/SISchemeServiceImpl.java
# src/com/engine/salary/service/impl/SalaryAcctResultServiceImpl.java
# src/com/engine/salary/service/impl/SalaryBillServiceImpl.java
# src/com/engine/salary/service/impl/SalaryFormulaServiceImpl.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/wrapper/SalaryFormulaWrapper.java
# src/com/engine/salary/wrapper/SalaryItemWrapper.java
|
2023-10-08 12:11:06 +08:00 |
 钱涛
|
2b13d0c7ef
|
定薪账套
|
2023-09-14 11:56:00 +08:00 |
|
sy
|
026ef5c0e6
|
薪酬系统-多语言配置，适配部分中文字符串0505
|
2023-05-05 17:59:04 +08:00 |
|
Harryxzy
|
69dd9cc61c
|
个税扣缴义务人、薪资账套 导入添加员工状态导入功能
|
2023-02-08 17:48:14 +08:00 |
|
Harryxzy
|
fd470c56aa
|
薪资账套人员范围导入
|
2023-01-09 15:12:44 +08:00 |
|
Harryxzy
|
09ba495bf3
|
个税扣缴义务人批量导入功能
|
2023-01-09 10:01:47 +08:00 |
|
Harryxzy
|
7c358fe3a0
|
xzy-fix-薪资档案中默认人员范围
|
2022-10-09 17:51:30 +08:00 |
|
Harryxzy
|
8c4050fe73
|
xzy-fix-薪资账套人员状态传参问题
|
2022-10-09 15:20:04 +08:00 |
|
Harryxzy
|
e3a2a52ab8
|
xzy-fix-薪资账套人员错误问题
|
2022-10-09 13:32:05 +08:00 |
|
Harryxzy
|
6dcecfb1c1
|
xzy-fix-薪资账套
|
2022-10-08 16:00:08 +08:00 |
|
钱涛
|
a2c59d15f4
|
项目分类bug
|
2022-05-12 14:36:16 +08:00 |
|
钱涛
|
c01e63040c
|
薪资项目&账套
|
2022-03-22 21:01:38 +08:00 |
|
钱涛
|
8922047306
|
税率接口及相关基础类
|
2022-03-01 16:45:57 +08:00 |