 钱涛
|
e187ee57e0
|
获取所有账套列表接口
|
2024-03-07 09:52:21 +08:00 |
Harryxzy
|
20d7266db9
|
Merge branch 'feature/240201_社保福利台账导入字段缓存' into release/2.11.1.2402.01
# Conflicts:
# src/com/engine/salary/service/impl/SIAccountServiceImpl.java
|
2024-03-06 13:50:56 +08:00 |
|
Harryxzy
|
0ac291d83d
|
Merge branch 'feature/操作日志组件' into release/2.11.1.2402.01
|
2024-03-06 09:23:21 +08:00 |
|
Harryxzy
|
8984369343
|
薪资档案、社保档案查看日志
|
2024-03-05 15:15:20 +08:00 |
|
Harryxzy
|
6c2d20a5a7
|
Merge branch 'feature/240101_我的薪资福利显示页签支持配置' into release/2.11.1.2402.01
|
2024-03-05 14:24:19 +08:00 |
|
Harryxzy
|
5485f7d260
|
社保福利台账导入，表单字段缓存
|
2024-03-01 17:40:19 +08:00 |
|
Harryxzy
|
a39806bb92
|
我的薪资福利显示页签支持配置
|
2024-02-23 11:04:14 +08:00 |
|
Harryxzy
|
dee20149bb
|
日志
|
2024-02-21 18:19:02 +08:00 |
|
Harryxzy
|
b4f36ab101
|
Merge branch 'feature/240102_工资单确认和反馈按钮分开' into release/2.10.1.2401.01
|
2024-02-20 09:51:00 +08:00 |
|
Harryxzy
|
ee82d1cb9a
|
工资单确认反馈优化
|
2024-02-19 14:16:47 +08:00 |
|
Harryxzy
|
7fe03ac7a1
|
工资单确认反馈优化
|
2024-02-19 10:09:49 +08:00 |
|
Harryxzy
|
e75cfae309
|
Merge branch 'feature/240101_工资单反馈区分pc和移动端' into release/2.10.1.2401.01
|
2024-01-31 16:13:27 +08:00 |
|
Harryxzy
|
2331ef354e
|
工资单确认和反馈按钮分开
|
2024-01-30 15:53:55 +08:00 |
|
Harryxzy
|
12f66512df
|
工资单反馈区分pc和移动端
|
2024-01-30 13:50:05 +08:00 |
sy
|
f215b45afa
|
薪酬系统-工资单模板，复制功能改造，获取带选择薪资项目逻辑改造
|
2024-01-26 10:04:53 +08:00 |
|
钱涛
|
6fc8d8fdee
|
去除达梦驱动
|
2024-01-25 11:38:38 +08:00 |
|
Harryxzy
|
71f90882d3
|
工资单反馈区分pc和移动端
|
2024-01-23 16:45:09 +08:00 |
|
Harryxzy
|
d6705e8917
|
产品-批量编辑
|
2023-12-11 13:09:20 +08:00 |
|
Harryxzy
|
2b6b1ef2c4
|
Merge branch 'custom/鲁控数字' into feature/231202-批量编辑
|
2023-12-11 11:36:59 +08:00 |
|
Harryxzy
|
419baeb8cd
|
鲁控数字
|
2023-12-06 16:05:08 +08:00 |
|
钱涛
|
390251bd63
|
Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01
|
2023-12-05 15:08:44 +08:00 |
|
钱涛
|
dd48bff747
|
同步所有档案起始发薪日期为入职日期
|
2023-12-05 15:08:37 +08:00 |
|
Harryxzy
|
4eb931686e
|
鲁控数字temp
|
2023-12-05 14:57:34 +08:00 |
|
Harryxzy
|
3687bdfcdc
|
Merge remote-tracking branch 'origin/release/2.9.9.2312.01' into release/2.9.9.2312.01
|
2023-12-05 11:30:04 +08:00 |
|
Harryxzy
|
b093717e46
|
Merge branch 'fix/231102_账套增加义务人筛选' into release/2.9.9.2312.01
|
2023-12-05 11:28:47 +08:00 |
|
sy
|
ce10204dab
|
Merge remote-tracking branch 'remotes/origin/feature/231102-福利台账，补差待编辑项扩充其他可缴纳福利项' into release/2.9.9.2312.01
|
2023-12-05 11:26:48 +08:00 |
|
Harryxzy
|
a0331112be
|
Merge branch 'fie/231102_线下对比列头改造' into release/2.9.9.2312.01
|
2023-12-05 11:26:22 +08:00 |
|
Harryxzy
|
df25f99544
|
薪资核算固定列头
|
2023-11-29 16:48:09 +08:00 |
|
sy
|
c8e3d6312b
|
薪酬系统-福利核算，补差待编辑福利项列表功能接口，补缴第三种方式的待编辑福利项获取逻辑优化，补差编辑tab页待编辑福利项获取逻辑优化
|
2023-11-24 14:05:03 +08:00 |
|
钱涛
|
f77b4c063b
|
去除文化遗产
|
2023-11-23 10:25:33 +08:00 |
|
Harryxzy
|
805fb9ff3c
|
1、薪资账套页面增加义务人筛选条件
2、薪资核算页面增加义务人列表
|
2023-11-20 16:14:51 +08:00 |
|
Harryxzy
|
c0ca63129e
|
线下对比优化
|
2023-11-16 16:56:50 +08:00 |
|
钱涛
|
e1a4e275ff
|
短信模板设置接口
|
2023-11-16 15:41:29 +08:00 |
|
Harryxzy
|
97a5d4ab91
|
线下对比表头改造成分组的样式
|
2023-11-15 17:12:52 +08:00 |
|
钱涛
|
2c12b10171
|
1、减少人员bug
2、档案项目输入bug
|
2023-11-13 17:12:25 +08:00 |
|
钱涛
|
213deb731c
|
调薪记录bug
|
2023-10-18 17:01:37 +08:00 |
|
钱涛
|
5d7a6bc241
|
调薪记录
|
2023-10-17 18:04:47 +08:00 |
|
钱涛
|
4a59859fa8
|
调薪记录
|
2023-10-12 17:34:09 +08:00 |
|
Harryxzy
|
03d3befbdd
|
token
|
2023-10-11 14:07:23 +08:00 |
|
钱涛
|
138f832537
|
时效性过滤
|
2023-10-08 10:11:07 +08:00 |
|
钱涛
|
d98933832a
|
Merge branch 'feature/生成签名pdf' into release/2.9.6.2310.01
# Conflicts:
# src/com/engine/salary/web/SalaryBillController.java
|
2023-10-07 15:19:38 +08:00 |
|
钱涛
|
5241972151
|
工资单时效设置
|
2023-10-07 14:46:28 +08:00 |
|
sy
|
5f84ed451b
|
Merge remote-tracking branch 'remotes/origin/feature/230901-福利台账-调差，支持一个人存在多个调差记录' into release/2.9.5.2309.01
|
2023-09-21 14:09:54 +08:00 |
|
Harryxzy
|
cdefb1d310
|
Merge branch 'feature/230902_报表共享' into release/2.9.5.2309.01
|
2023-09-21 11:45:34 +08:00 |
|
钱涛
|
c86151225d
|
流程获取档案信息v2
|
2023-09-21 11:43:41 +08:00 |
|
钱涛
|
3609045de2
|
流程获取档案信息
|
2023-09-21 10:58:19 +08:00 |
|
Harryxzy
|
dfc8a1c578
|
报表共享
|
2023-09-21 09:38:38 +08:00 |
|
钱涛
|
9ab80de441
|
工资单pdf和签名
|
2023-09-20 14:45:44 +08:00 |
|
sy
|
0ad4a63a6b
|
Merge remote-tracking branch 'remotes/origin/fix/230901-福利档案编辑问题修复' into feature/230901-福利台账-调差，支持一个人存在多个调差记录
|
2023-09-12 11:30:12 +08:00 |
|
sy
|
b276066b52
|
薪酬系统-福利台账，导入模板带出核算数据
|
2023-09-12 11:05:46 +08:00 |