 钱涛
|
7e22711dcd
|
导入工具
|
2023-12-28 15:47:05 +08:00 |
|
钱涛
|
06fe3144ba
|
导入模板
|
2023-12-28 15:37:01 +08:00 |
|
钱涛
|
2befcfd1f2
|
pg脚本问题
|
2023-12-28 11:08:53 +08:00 |
Harryxzy
|
e976c7aaec
|
oracle工资单模板保存异常
|
2023-12-27 09:32:31 +08:00 |
|
钱涛
|
ed29be3701
|
日志
|
2023-12-26 18:47:45 +08:00 |
|
钱涛
|
7d1ce983dd
|
日志
|
2023-12-26 17:49:50 +08:00 |
|
钱涛
|
b7435554e8
|
操作日志前端接口
|
2023-12-26 16:12:44 +08:00 |
|
Harryxzy
|
22d3b629a1
|
Merge branch 'custom/上海港湾' into custom/上海港湾-多语言
|
2023-12-25 18:21:46 +08:00 |
|
Harryxzy
|
00b376b924
|
港湾，义务人fix
|
2023-12-25 18:21:26 +08:00 |
|
Harryxzy
|
ca22670955
|
Merge branch 'fix/231202-个税扣缴以为人根据名称查询' into custom/上海港湾-多语言
|
2023-12-25 16:32:34 +08:00 |
|
Harryxzy
|
2ed856ac18
|
Merge branch 'fix/231202-个税扣缴以为人根据名称查询' into release/2.9.10.2312.02
|
2023-12-25 16:32:11 +08:00 |
|
Harryxzy
|
e67cb5bf83
|
个税扣缴义务人like分成3个
|
2023-12-25 16:31:36 +08:00 |
|
钱涛
|
8b5703c894
|
薪资项目操作日志
|
2023-12-25 09:36:23 +08:00 |
|
钱涛
|
ea8d51c493
|
薪资项目操作日志
|
2023-12-22 16:36:11 +08:00 |
|
Harryxzy
|
9404f066d0
|
Merge branch 'custom/上海港湾' into custom/上海港湾-多语言
|
2023-12-22 16:05:39 +08:00 |
|
Harryxzy
|
cdc77ea801
|
港湾fix
|
2023-12-22 16:05:14 +08:00 |
|
Harryxzy
|
540aec23ae
|
Merge branch 'custom/上海港湾' into custom/上海港湾-多语言
|
2023-12-22 15:44:50 +08:00 |
|
Harryxzy
|
02f8da3a81
|
港湾fix
|
2023-12-22 15:44:28 +08:00 |
|
钱涛
|
7a23324744
|
修改elog版本表名
|
2023-12-22 14:52:09 +08:00 |
|
钱涛
|
bd0edcf8e2
|
日志组件
|
2023-12-22 14:50:16 +08:00 |
|
钱涛
|
7e980db4b3
|
日志组件
|
2023-12-21 20:25:00 +08:00 |
|
钱涛
|
83a41da11d
|
日志组件
|
2023-12-21 14:30:21 +08:00 |
sy
|
a5eb86ab06
|
薪酬系统-福利台账，线下对比导入功能优化，适配福利基数个人和公司导入
|
2023-12-21 13:33:21 +08:00 |
|
钱涛
|
b20a3ef103
|
暂存
|
2023-12-20 21:00:48 +08:00 |
|
钱涛
|
e8223a832b
|
缓存识别条件
|
2023-12-16 12:40:33 +08:00 |
|
钱涛
|
bda3d7080b
|
缓存识别条件
|
2023-12-16 12:36:56 +08:00 |
|
钱涛
|
4f8606b00e
|
缓存识别条件
|
2023-12-16 12:35:24 +08:00 |
|
Harryxzy
|
253403668c
|
Merge remote-tracking branch 'origin/custom/上海港湾-多语言' into custom/上海港湾-多语言
|
2023-12-15 16:45:19 +08:00 |
|
Harryxzy
|
32cc4bb602
|
Merge branch 'custom/上海港湾' into custom/上海港湾-多语言
|
2023-12-15 16:31:07 +08:00 |
|
Harryxzy
|
4b89ece56d
|
港湾temp
|
2023-12-15 15:46:27 +08:00 |
|
Harryxzy
|
9191e00d33
|
港湾temp
|
2023-12-15 15:17:28 +08:00 |
|
sy
|
7cb0e68623
|
薪酬系统-福利档案，福利档案编辑页公司基数信息返回逻辑优化
|
2023-12-15 09:50:20 +08:00 |
|
sy
|
be4fccd5c2
|
Merge remote-tracking branch 'remotes/origin/feature/salary_i18' into custom/上海港湾-多语言
|
2023-12-14 17:10:27 +08:00 |
|
sy
|
19ce3e8146
|
薪酬系统-多语言，工资单模板编辑支持薪资项目分组重命名
|
2023-12-14 17:09:53 +08:00 |
|
sy
|
20a2d54139
|
Merge remote-tracking branch 'remotes/origin/release/2.9.9.2312.01' into feature/salary_i18
|
2023-12-14 16:24:12 +08:00 |
|
sy
|
7a2366a112
|
薪酬系统-多语言，工资单模板编辑暂时不支持薪资项目重命名
|
2023-12-14 16:23:13 +08:00 |
|
Harryxzy
|
14cb45f4bc
|
Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02
|
2023-12-14 16:00:46 +08:00 |
|
Harryxzy
|
85f009984c
|
Merge branch 'fix/231202_补发工资单回算项' into release/2.9.10.2312.02
|
2023-12-14 16:00:24 +08:00 |
|
Harryxzy
|
e97a35f158
|
新建补发工资单模板时，已发补发项目fix
|
2023-12-14 15:57:55 +08:00 |
|
sy
|
46b0cefe08
|
薪酬系统-二开，上海港湾-多语言，翻译部分中文表述
|
2023-12-14 14:59:25 +08:00 |
|
sy
|
7207be9278
|
Merge remote-tracking branch 'remotes/origin/feature/salary_i18' into custom/上海港湾-多语言
|
2023-12-14 14:10:34 +08:00 |
|
sy
|
2685c724e4
|
薪酬系统-福利档案，福利档案编辑页方案基础信息返回逻辑优化
|
2023-12-14 13:59:39 +08:00 |
|
sy
|
54542c9a94
|
薪酬系统-多语言，工资单模板编辑优化，薪资项目支持多语言编辑
|
2023-12-14 13:47:53 +08:00 |
|
钱涛
|
d53897d147
|
Merge remote-tracking branch 'origin/release/2.9.10.2312.02' into release/2.9.10.2312.02
|
2023-12-14 10:40:06 +08:00 |
|
钱涛
|
96d37b1b68
|
修复申报表明细
|
2023-12-14 10:39:49 +08:00 |
|
sy
|
5b41809853
|
Merge remote-tracking branch 'remotes/origin/feature/salary_i18' into custom/上海港湾-多语言
|
2023-12-14 09:52:57 +08:00 |
|
sy
|
97b30d5a73
|
薪酬系统-多语言，补缴、薪资核算导出、补差编辑显示功能修复
|
2023-12-14 09:51:26 +08:00 |
|
sy
|
f5494986cd
|
薪酬系统-二开，上海港湾-多语言，处理冲突
|
2023-12-13 17:20:13 +08:00 |
|
sy
|
be3ad3b47b
|
薪酬系统-二开，上海港湾-多语言，拉取多语言1201分支，处理冲突
|
2023-12-13 17:17:57 +08:00 |
|
sy
|
6c5e4ec456
|
Merge remote-tracking branch 'remotes/origin/feature/salary_i18' into custom/上海港湾-多语言
# Conflicts:
# src/com/engine/salary/entity/salaryacct/bo/SalaryAcctRecordBO.java
# src/com/engine/salary/entity/salaryacct/dto/SalaryAcctRecordListDTO.java
# src/com/engine/salary/service/impl/SalarySendServiceImpl.java
# src/com/engine/salary/web/SalaryBillController.java
# src/com/engine/salary/wrapper/SalaryAcctRecordWrapper.java
# src/com/engine/salary/wrapper/SalarySendWrapper.java
|
2023-12-13 16:59:22 +08:00 |