 钱涛
|
a22aa624db
|
权限控制
|
2024-08-22 15:37:50 +08:00 |
|
钱涛
|
25321bb357
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
|
2024-08-21 15:49:12 +08:00 |
Harryxzy
|
59820f6aca
|
Merge branch 'fix/240801-核算导入支持vlookup' into release/2.15.1.2407.01
|
2024-08-20 14:03:58 +08:00 |
|
Harryxzy
|
2a58b4972b
|
薪资核算导入支持vlookup函数
|
2024-08-20 13:48:31 +08:00 |
|
钱涛
|
9fae93fcd7
|
Merge branch 'feature/导入工具' into release/2.15.1.2407.01
|
2024-08-20 11:40:33 +08:00 |
|
钱涛
|
9121268815
|
修复重新导入账套bug
|
2024-08-20 09:29:14 +08:00 |
|
钱涛
|
a796752203
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
# Conflicts:
# src/com/engine/salary/entity/taxagent/bo/TaxAgentBO.java
|
2024-08-19 10:43:43 +08:00 |
|
钱涛
|
cd8d4601af
|
全量迁移配置
|
2024-08-19 09:49:49 +08:00 |
|
Harryxzy
|
8742ee7857
|
Merge branch 'fix/240801-工资明细导出excel单元格格式' into release/2.15.1.2407.01
|
2024-08-16 15:27:15 +08:00 |
|
钱涛
|
d23baeb940
|
支持Vlookup
|
2024-08-16 12:19:18 +08:00 |
|
钱涛
|
673699dfb8
|
导入工具明细
|
2024-08-16 11:18:27 +08:00 |
|
Harryxzy
|
be6e7bb787
|
工资明细导出excel单元格格式
|
2024-08-16 11:08:57 +08:00 |
|
钱涛
|
7250ed3520
|
修复组织信息快照，主动添加或者sql添加人员丢失
|
2024-08-15 17:03:17 +08:00 |
|
钱涛
|
980dc2f532
|
导入工具
|
2024-08-15 16:25:31 +08:00 |
|
钱涛
|
c079b1d2e6
|
Merge branch 'release/2.15.1.2407.01' into feature/导入工具
|
2024-08-15 13:48:14 +08:00 |
|
钱涛
|
22ccad05ad
|
排除显示
|
2024-08-15 13:47:55 +08:00 |
|
钱涛
|
5071c08d8c
|
Merge branch 'release/2.15.1.2407.01' into feature/导入工具
# Conflicts:
# src/com/engine/salary/service/impl/SalarySobServiceImpl.java
|
2024-08-15 13:41:52 +08:00 |
|
Harryxzy
|
e9fef7d915
|
Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-15 11:10:49 +08:00 |
|
Harryxzy
|
4348954994
|
Merge branch 'feature/240801-报表义务人、账套分权' into release/2.15.1.2407.01
|
2024-08-15 11:09:09 +08:00 |
|
钱涛
|
d37434521d
|
Merge remote-tracking branch 'origin/release/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-15 10:37:57 +08:00 |
|
钱涛
|
f74ec99644
|
账套支持sql范围
|
2024-08-15 10:37:41 +08:00 |
|
钱涛
|
6450254371
|
薪酬迁移工具
|
2024-08-14 14:47:27 +08:00 |
|
Harryxzy
|
832a6ac1ec
|
社保福利台账明细导入2100bug
|
2024-08-14 11:17:56 +08:00 |
|
钱涛
|
9d26e1228f
|
薪酬迁移工具
|
2024-08-13 18:15:04 +08:00 |
|
Harryxzy
|
a05fb6fcf0
|
报表义务人、账套分权
|
2024-08-13 13:45:24 +08:00 |
|
钱涛
|
845f117d9c
|
excel导入工具
|
2024-08-12 17:17:52 +08:00 |
|
钱涛
|
ecb0f6f7bc
|
excel导入工具
|
2024-08-12 15:16:06 +08:00 |
|
钱涛
|
31cd3981e2
|
添加日志
|
2024-08-09 17:30:44 +08:00 |
|
钱涛
|
dd257ec53e
|
xml文件
|
2024-08-09 09:22:27 +08:00 |
|
钱涛
|
6532225da3
|
迁移工具
|
2024-08-08 18:04:50 +08:00 |
|
钱涛
|
83a408afa2
|
迁移工具
|
2024-08-08 16:53:31 +08:00 |
|
钱涛
|
080a69c929
|
全量迁移
|
2024-08-08 09:50:04 +08:00 |
|
钱涛
|
484639a690
|
导入薪资项目、模板、预览
|
2024-08-07 14:40:08 +08:00 |
|
钱涛
|
d30380e2e7
|
导入薪资项目、模板、预览
|
2024-08-07 14:23:35 +08:00 |
|
钱涛
|
b8b9cbbe6c
|
导入薪资项目
|
2024-08-07 13:25:57 +08:00 |
|
钱涛
|
48120f8e24
|
导入薪资项目
|
2024-08-07 09:06:09 +08:00 |
|
Harryxzy
|
dd18cf5191
|
考勤引用多个账套
|
2024-08-06 16:54:19 +08:00 |
|
钱涛
|
bd6e30b63b
|
导入薪资项目
|
2024-08-06 14:24:08 +08:00 |
|
钱涛
|
10d988084b
|
导入工具
|
2024-08-06 10:32:57 +08:00 |
|
钱涛
|
4dcb3b4fea
|
薪资档案分权
|
2024-08-05 15:40:34 +08:00 |
|
钱涛
|
4d8c54bf8a
|
角色加描述
|
2024-08-02 16:18:26 +08:00 |
|
钱涛
|
a8b487c94b
|
Merge branch 'release/2.15.1.2407.01' into feature/权限
# Conflicts:
# src/com/engine/salary/mapper/datacollection/EmployMapper.java
# src/com/engine/salary/mapper/datacollection/EmployMapper.xml
# src/com/engine/salary/service/SalaryEmployeeService.java
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2024-08-01 10:16:05 +08:00 |
|
Harryxzy
|
bcf5fbdce7
|
Merge branch 'fix/240702-社保福利档案导入下载模板bug' into release/2.15.1.2407.01
|
2024-07-30 18:17:49 +08:00 |
|
Harryxzy
|
0c3610961f
|
修复社保福利档案 高级搜索后下载导入模板bug
|
2024-07-30 17:29:12 +08:00 |
|
Harryxzy
|
9819bb25e0
|
修复社保福利台账补差添加bug
|
2024-07-29 10:58:41 +08:00 |
|
钱涛
|
76543c6021
|
成员同步
|
2024-07-26 16:35:51 +08:00 |
|
Harryxzy
|
bdd27bcfc6
|
核算时编辑人员组织信息
|
2024-07-25 14:04:14 +08:00 |
|
Harryxzy
|
6f7ae2506d
|
阅后即焚oracle数据库修复
|
2024-07-16 14:56:11 +08:00 |
|
Harryxzy
|
78cdadbb99
|
工资单详情 - 显示列定制
|
2024-07-16 11:30:25 +08:00 |
|
Harryxzy
|
95ba4aee36
|
Merge branch 'fix/240701_返聘action优化' into release/2.15.1.2407.01
|
2024-07-15 14:48:21 +08:00 |