 钱涛
|
4a74e5ea40
|
暂存
|
2023-07-17 15:06:42 +08:00 |
|
钱涛
|
5d6a471fb8
|
删除未适配数据库
|
2023-07-17 14:37:15 +08:00 |
|
钱涛
|
1b289319a4
|
工资单反馈sql
|
2023-07-17 11:52:10 +08:00 |
|
钱涛
|
fbdf93cf5b
|
取消不用系统算税时一系列校验
|
2023-07-17 10:20:54 +08:00 |
|
钱涛
|
152eeaa68e
|
所有配置文件
|
2023-07-13 16:55:23 +08:00 |
|
钱涛
|
385726fa76
|
所有配置文件
|
2023-07-13 16:51:01 +08:00 |
|
钱涛
|
1d32b4b015
|
授权文件id过长
|
2023-07-13 14:36:11 +08:00 |
|
钱涛
|
d5977c053b
|
添加删除脚本
|
2023-07-13 09:19:16 +08:00 |
Harryxzy
|
5918de016e
|
Merge branch 'feature/salalryItemAndFieldSort' into release/2.9.1.2307.01
# Conflicts:
# src/com/engine/salary/service/impl/SalaryItemServiceImpl.java
|
2023-07-11 13:24:37 +08:00 |
|
Harryxzy
|
fa950fb4dd
|
薪资项目排序比较
|
2023-07-11 13:23:07 +08:00 |
sy
|
fd9a9aef72
|
Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01
|
2023-07-11 11:31:29 +08:00 |
|
sy
|
ad37ba9af0
|
薪酬系统-薪资档案，高级搜索中工号、分部筛选问题修复
|
2023-07-11 11:30:57 +08:00 |
|
sy
|
c28f782f19
|
Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01
|
2023-07-11 11:11:15 +08:00 |
|
sy
|
83604ba534
|
薪酬系统-福利台账，修改台账列表返回台账状态值返回逻辑
|
2023-07-11 11:10:32 +08:00 |
|
钱涛
|
f53c904fde
|
Merge branch 'fix/230701修复项目添加时名称校验问题' into release/2.9.1.2307.01
|
2023-07-11 11:08:39 +08:00 |
|
钱涛
|
bb6cf386cb
|
修复
|
2023-07-11 11:05:35 +08:00 |
|
Harryxzy
|
1f5af02056
|
Merge branch 'feature/230701-工资单定时发送' into release/2.9.1.2307.01
|
2023-07-11 10:22:42 +08:00 |
|
Harryxzy
|
287fcae68e
|
工资单定时发送sql
|
2023-07-11 10:22:14 +08:00 |
|
Harryxzy
|
7a72ef28d1
|
Merge remote-tracking branch 'origin/release/2.9.1.2307.01' into release/2.9.1.2307.01
|
2023-07-11 10:14:46 +08:00 |
|
Harryxzy
|
7d9ad3d79e
|
不允许删除薪资档案校验
|
2023-07-11 10:14:28 +08:00 |
|
sy
|
a55ca5182e
|
Merge remote-tracking branch 'remotes/origin/fix/salaryExportBug-0706' into release/2.9.1.2307.01
|
2023-07-11 09:59:29 +08:00 |
|
sy
|
e67530eb87
|
薪酬系统-福利档案，导出加高级搜索问题修复
|
2023-07-10 17:20:04 +08:00 |
|
sy
|
b705161492
|
薪酬系统-薪资核算、薪资档案、福利档案，高级搜索功能问题修复
|
2023-07-10 14:33:43 +08:00 |
|
Harryxzy
|
0e2a6c8368
|
Merge branch 'feature/taxDeclarationWithdraw' into release/2.9.1.2307.01
# Conflicts:
# src/com/engine/salary/sys/constant/SalarySysConstant.java
# src/com/engine/salary/sys/entity/vo/AppSettingVO.java
# src/com/engine/salary/sys/service/SalarySysConfService.java
# src/com/engine/salary/sys/service/impl/SalarySysConfServiceImpl.java
# src/com/engine/salary/web/SalarySystemConfigController.java
# src/com/engine/salary/wrapper/SalarySystemConfigWrapper.java
|
2023-07-10 11:10:10 +08:00 |
|
Harryxzy
|
b7c58ecc11
|
Merge branch 'fix/累计专项附加扣除防抖动' into release/2.9.1.2307.01
|
2023-07-10 10:10:58 +08:00 |
|
Harryxzy
|
938f03946b
|
Merge branch 'feature/230701-系统薪资项目可配置删除' into release/2.9.1.2307.01
|
2023-07-10 10:09:52 +08:00 |
|
Harryxzy
|
9b7ba19d64
|
Merge branch 'feature/230701-工资单定时发送' into release/2.9.1.2307.01
|
2023-07-10 10:09:45 +08:00 |
|
Harryxzy
|
e90bd66489
|
Merge branch 'feature/230701-删除档案' into release/2.9.1.2307.01
|
2023-07-10 10:09:38 +08:00 |
|
sy
|
b92c7ff599
|
薪酬系统-薪资核算、薪资档案、福利档案，高级搜索中的状态条件改为数组类型的入参
|
2023-07-07 15:32:12 +08:00 |
|
sy
|
9c34fb9497
|
薪酬系统-薪资核算，搜索条件新增字段
|
2023-07-07 11:47:43 +08:00 |
|
sy
|
fa28db9c79
|
薪酬系统-薪资核算，高级搜索和导出带入筛选条件未生效问题修复
|
2023-07-07 10:15:23 +08:00 |
|
Harryxzy
|
40fc4ea13c
|
工资单定时发送 调整周期类型
|
2023-07-05 11:39:54 +08:00 |
|
Harryxzy
|
508e324dac
|
工资单定时发送 添加 发放周期
|
2023-07-05 10:36:02 +08:00 |
|
Harryxzy
|
896e0c9e34
|
工资单定时发送 添加 发放周期
|
2023-07-05 09:59:45 +08:00 |
|
Harryxzy
|
c78839d8c0
|
工资单定时发送 添加 发放周期
|
2023-07-04 18:03:57 +08:00 |
|
钱涛
|
91859e5127
|
Merge branch 'feature/230701非系统算税' into release/2.9.1.2307.01
|
2023-07-04 15:38:55 +08:00 |
|
sy
|
0e8aa4995d
|
Merge remote-tracking branch 'remotes/origin/fix/importTemplateRemarkRepair' into release/2.9.1.2307.01
|
2023-07-04 14:51:07 +08:00 |
|
sy
|
7f7e7cd453
|
薪酬系统-薪资档案，导入模板字段提示位置问题修复
|
2023-07-04 14:48:02 +08:00 |
|
Harryxzy
|
a5a05aabda
|
工资单定时发送fix
|
2023-07-04 14:35:51 +08:00 |
|
Harryxzy
|
c8cf6090ff
|
系统薪资项目可配置删除、工资单模板默认没有隐藏项目
|
2023-07-04 13:21:19 +08:00 |
|
钱涛
|
82ab6c1e11
|
非系统算税功能
|
2023-07-04 09:32:12 +08:00 |
|
Harryxzy
|
8dc3883168
|
工资单定时发送
|
2023-07-03 17:46:11 +08:00 |
|
钱涛
|
a37d6758bb
|
核算状态标识
|
2023-07-03 14:27:20 +08:00 |
|
钱涛
|
1403b22cf7
|
修复邮件保存
|
2023-07-03 14:02:34 +08:00 |
|
Harryxzy
|
11c416601d
|
工资单定时发送渲染bug
|
2023-07-03 11:21:49 +08:00 |
|
Harryxzy
|
5e4f32dbab
|
累计专项附加扣除更新插入时间修正
|
2023-07-03 10:34:30 +08:00 |
|
Harryxzy
|
2bf99d3ec1
|
累计专项附加扣除防抖动修复
|
2023-07-03 10:33:01 +08:00 |
|
Harryxzy
|
faa2b9c16e
|
工资单模板信息
|
2023-07-03 09:44:10 +08:00 |
|
Harryxzy
|
18fb376054
|
个税申报撤回fix
|
2023-06-30 16:41:06 +08:00 |
|
Harryxzy
|
9842784297
|
工资单定时发送 - 模板保存
|
2023-06-30 15:58:55 +08:00 |