Harryxzy
|
0f6184fc9b
|
Merge branch 'release/2.15.1.2407.01' into custom/京贵投资
|
2024-08-16 15:29:26 +08:00 |
|
Harryxzy
|
8742ee7857
|
Merge branch 'fix/240801-工资明细导出excel单元格格式' into release/2.15.1.2407.01
|
2024-08-16 15:27:15 +08:00 |
|
Harryxzy
|
006b0a898a
|
Merge branch 'feature/240801-浮动薪资' into custom/京贵投资
|
2024-08-16 15:18:33 +08:00 |
|
Harryxzy
|
ebda09aefd
|
浮动薪酬多语言
|
2024-08-16 15:17:25 +08:00 |
 钱涛
|
105129165d
|
Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资
|
2024-08-16 14:40:02 +08:00 |
|
钱涛
|
22c99e081d
|
支持Vlookup
|
2024-08-16 14:39:01 +08:00 |
|
钱涛
|
10b8be86d1
|
Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资
|
2024-08-16 14:14:30 +08:00 |
|
钱涛
|
4b9341cc98
|
支持Vlookup
|
2024-08-16 14:13:59 +08:00 |
|
钱涛
|
94d068356b
|
Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资
|
2024-08-16 14:07:56 +08:00 |
|
钱涛
|
4b30292c6c
|
支持Vlookup
|
2024-08-16 14:07:16 +08:00 |
|
钱涛
|
e2b2b9071f
|
Merge remote-tracking branch 'origin/feature/240801-浮动薪资' into feature/240801-浮动薪资
|
2024-08-16 14:04:31 +08:00 |
|
钱涛
|
1d388a1993
|
支持Vlookup
|
2024-08-16 14:04:20 +08:00 |
|
钱涛
|
659560550a
|
Merge branch 'release/2.15.1.2407.01' into feature/240801-浮动薪资
|
2024-08-16 13:18:08 +08:00 |
|
钱涛
|
d23baeb940
|
支持Vlookup
|
2024-08-16 12:19:18 +08:00 |
|
Harryxzy
|
be6e7bb787
|
工资明细导出excel单元格格式
|
2024-08-16 11:08:57 +08:00 |
|
Harryxzy
|
e20b6cb2f6
|
Merge branch 'release/2.15.1.2407.01' into custom/京贵投资
|
2024-08-15 17:11:02 +08:00 |
|
钱涛
|
7250ed3520
|
修复组织信息快照，主动添加或者sql添加人员丢失
|
2024-08-15 17:03:17 +08:00 |
|
Harryxzy
|
d53d8f1ad0
|
Merge branch 'feature/240801-浮动薪资' into custom/京贵投资
|
2024-08-15 16:18:11 +08:00 |
|
Harryxzy
|
a4d91c3c97
|
删除无用代码
|
2024-08-15 16:01:00 +08:00 |
|
Harryxzy
|
2ee605df44
|
浮动薪酬优化
|
2024-08-15 13:56:41 +08:00 |
|
钱涛
|
22ccad05ad
|
排除显示
|
2024-08-15 13:47:55 +08:00 |
|
钱涛
|
c5c469e4c4
|
修复邮件不显示入职日期
|
2024-08-15 11:54:18 +08:00 |
|
Harryxzy
|
1aba7ab94d
|
Merge branch 'release/2.15.1.2407.01' into custom/京贵投资
# Conflicts:
# src/com/engine/salary/service/impl/SalaryEmployeeServiceImpl.java
|
2024-08-15 11:41:17 +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 |
|
钱涛
|
2b2e9ea504
|
账套支持sql范围
|
2024-08-15 10:53:08 +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 |
|
Harryxzy
|
832a6ac1ec
|
社保福利台账明细导入2100bug
|
2024-08-14 11:17:56 +08:00 |
|
Harryxzy
|
89d12fe8fe
|
Merge branch 'feature/240801-浮动薪资' into custom/京贵投资
|
2024-08-13 15:27:00 +08:00 |
|
Harryxzy
|
c255d74912
|
批量导入 分页
|
2024-08-13 15:25:57 +08:00 |
|
Harryxzy
|
a05fb6fcf0
|
报表义务人、账套分权
|
2024-08-13 13:45:24 +08:00 |
|
Harryxzy
|
19dec3c665
|
Merge branch 'feature/240801-浮动薪资' into custom/京贵投资
|
2024-08-12 17:23:13 +08:00 |
|
Harryxzy
|
2e7657eb23
|
浮动薪酬增加义务人
|
2024-08-12 17:21:11 +08:00 |
|
Harryxzy
|
9c9aee9781
|
Merge branch 'feature/240801-浮动薪资' into custom/京贵投资
|
2024-08-12 17:11:37 +08:00 |
|
Harryxzy
|
a0dff5780a
|
浮动薪酬增加义务人sql
|
2024-08-12 17:11:17 +08:00 |
|
Harryxzy
|
71f10872bd
|
Merge branch 'feature/240801-浮动薪资' into custom/京贵投资
|
2024-08-12 16:50:07 +08:00 |
|
Harryxzy
|
1ebc56bb70
|
浮动薪酬增加义务人sql
|
2024-08-12 16:49:29 +08:00 |
|
Harryxzy
|
5055a4801a
|
浮动薪酬增加义务人
|
2024-08-12 16:36:27 +08:00 |
|
Harryxzy
|
fd290a351e
|
适配老版考勤引用
|
2024-08-09 10:56:06 +08:00 |
|
Harryxzy
|
f5834a8a07
|
Merge branch 'feature/240801-考勤引用多个账套' into custom/京贵投资
|
2024-08-09 10:29:00 +08:00 |
|
Harryxzy
|
ad10e62674
|
Merge branch 'feature/240801-浮动薪资' into custom/京贵投资
|
2024-08-09 10:28:55 +08:00 |
|
Harryxzy
|
1f7a1b7fb1
|
Merge branch 'release/2.15.1.2407.01' into custom/京贵投资
|
2024-08-09 10:25:48 +08:00 |
|
Harryxzy
|
75fb15928a
|
浮动薪酬
|
2024-08-09 10:21:40 +08:00 |
|
Harryxzy
|
dd18cf5191
|
考勤引用多个账套
|
2024-08-06 16:54:19 +08:00 |
|
钱涛
|
ff00de206c
|
线下对比
|
2024-08-05 17:23:25 +08:00 |
|
Harryxzy
|
8d057e2706
|
Merge branch 'feature/240702-编辑核算时人员信息' into release/2.15.1.2407.01
|
2024-08-01 10:53:29 +08:00 |
|
Harryxzy
|
8bbf8f3ff6
|
核算时编辑职称bug
|
2024-08-01 10:52:44 +08:00 |
|
钱涛
|
241a85c711
|
默认值
|
2024-07-31 14:59:03 +08:00 |
|
Harryxzy
|
bcf5fbdce7
|
Merge branch 'fix/240702-社保福利档案导入下载模板bug' into release/2.15.1.2407.01
|
2024-07-30 18:17:49 +08:00 |