 lys
|
1a02222bd3
|
feature/2.16.1.2410.01-薪资账套配置流程审批
|
2024-11-04 18:01:33 +08:00 |
|
lys
|
88dc06c35e
|
Merge branch 'release/2.16.1.2410.01' into feature/2.16.1.2410.01-次账号
|
2024-11-04 17:26:04 +08:00 |
|
lys
|
2e94324bb7
|
feature/2.15.2.2409.01合并业务线测试
|
2024-11-04 16:33:32 +08:00 |
|
lys
|
2699266c4c
|
Merge branch 'release/2.16.1.2410.01' into feature/2.15.2.2409.01合并业务线测试
|
2024-11-04 14:41:29 +08:00 |
|
lys
|
df4971fd27
|
release/2.16.1.2410.01
|
2024-11-01 18:28:12 +08:00 |
|
lys
|
98ca4cb03f
|
release/2.16.1.2410.01
|
2024-11-01 16:03:57 +08:00 |
|
lys
|
1f7fe615be
|
1release/2.16.1.2410.01
|
2024-11-01 14:50:37 +08:00 |
|
lys
|
728e683777
|
Merge branch 'feature/2.16.1.2410.01-数据采集重构' into feature/2.16.1.2410.01-薪资账套配置流程审批
|
2024-10-31 17:32:30 +08:00 |
|
lys
|
b461a2c801
|
custom/汇通建设
|
2024-10-31 17:05:24 +08:00 |
|
lys
|
f126179d1d
|
Merge branch 'feature/2.12.1.2404.02-薪资账套配置流程审批' into custom/四川紫金湾
# Conflicts:
# pc4mobx/hrmSalary/apis/calculate.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
# pc4mobx/hrmSalary/pages/ruleConfig/conditions.js
# pc4mobx/hrmSalary/pages/ruleConfig/ruleConfig.js
|
2024-10-31 17:02:27 +08:00 |
|
lys
|
e4800170a8
|
feature/2.15.2.2409.01合并业务线测试
|
2024-10-31 15:13:57 +08:00 |
|
lys
|
66c6c68460
|
feature/2.16.1.2410.01-数据采集重构
|
2024-10-31 10:22:16 +08:00 |
|
lys
|
004175f882
|
feature/2.16.1.2410.01-数据采集重构
|
2024-10-30 16:23:58 +08:00 |
|
lys
|
5e2f6bbbbc
|
feature/2.16.1.2410.01-数据采集重构
|
2024-10-30 10:59:46 +08:00 |
|
lys
|
09ea3da3e3
|
Merge branch 'release/2.16.1.2410.01' into feature/2.15.2.2409.01合并业务线测试
|
2024-10-30 10:27:18 +08:00 |
|
lys
|
c5a62b3c26
|
custom/京贵投资
|
2024-10-30 10:20:43 +08:00 |
|
lys
|
8488f54aac
|
release/2.16.1.2410.01
|
2024-10-29 09:21:38 +08:00 |
|
lys
|
000f36ec0e
|
feature/2.15.2.2409.01合并业务线测试
|
2024-10-28 14:57:09 +08:00 |
|
lys
|
444c9b19ab
|
release/2.16.1.2410.01
工资单模板设置添加薪资所属年的设置
|
2024-10-25 17:04:45 +08:00 |
|
lys
|
c10e6fb3ee
|
feature/2.16.1.2410.01-次账号
|
2024-10-25 11:46:00 +08:00 |
|
lys
|
ef86c4faef
|
release/2.16.1.2410.01
|
2024-10-25 09:49:15 +08:00 |
|
lys
|
368542a52b
|
Merge branch 'release/2.16.1.2410.01' into feature/2.15.2.2409.01合并业务线测试
# Conflicts:
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
# pc4mobx/hrmSalary/pages/ledgerPage/index.less
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordQuery.js
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
|
2024-10-25 09:43:15 +08:00 |
|
lys
|
02ff34c202
|
release/2.16.1.2410.01
|
2024-10-23 09:51:02 +08:00 |
|
lys
|
cfdc0cd5a0
|
release/2.16.1.2410.01
|
2024-10-22 14:53:36 +08:00 |
|
lys
|
8cdc711e71
|
custom/领悦业务线
|
2024-10-22 11:47:02 +08:00 |
|
lys
|
af13777e2d
|
Merge branch 'custom/领悦' into custom/领悦业务线
# Conflicts:
# pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiLeft.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiRight.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserOperation.js
# pc4mobx/hrmSalary/components/CustomBrowser/index.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSearchComp.js
# pc4mobx/hrmSalary/pages/ledgerPage/index.less
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/components/welfareRecordQuery.js
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
|
2024-10-21 18:12:51 +08:00 |
|
lys
|
38a8d6aeaf
|
Merge branch 'feature/2.15.2.2409.01合并业务线测试' into custom/领悦业务线
|
2024-10-21 17:56:21 +08:00 |
|
lys
|
92d75bf369
|
custom/领悦
|
2024-10-21 15:47:06 +08:00 |
|
lys
|
78d66f342f
|
custom/领悦
|
2024-10-21 14:32:25 +08:00 |
|
lys
|
9fd9860e4a
|
custom/领悦
|
2024-10-21 11:12:31 +08:00 |
|
lys
|
ebd228c496
|
Merge branch 'release/2.16.1.2410.01' into custom/领悦
|
2024-10-21 10:47:04 +08:00 |
|
lys
|
9d2fd951ef
|
release/2.16.1.2410.01-个税
|
2024-10-18 16:49:52 +08:00 |
|
lys
|
e7f1971370
|
feature/2.16.1.2410.01-薪资核算单元格锁定
|
2024-10-18 14:26:00 +08:00 |
|
lys
|
8c5b0acffa
|
feature/2.16.1.2410.01-薪资核算单元格锁定
|
2024-10-18 11:51:06 +08:00 |
|
lys
|
f407d8520d
|
release/2.16.1.2410.01
|
2024-10-17 11:18:53 +08:00 |
|
lys
|
4b125994f7
|
release/2.16.1.2410.01
|
2024-10-17 11:17:55 +08:00 |
|
lys
|
1a0f594753
|
release/2.15.2.2409.01
|
2024-10-16 16:18:32 +08:00 |
|
lys
|
600bba8619
|
feature/2.15.2.2409.01
|
2024-10-16 15:23:21 +08:00 |
|
lys
|
0a447773b8
|
feature/2.15.2.2409.01
|
2024-10-16 14:42:57 +08:00 |
|
lys
|
4b11f39155
|
feature/2.15.2.2409.01合并业务线测试
|
2024-10-16 11:18:10 +08:00 |
|
lys
|
73de6b8417
|
Merge branch 'release/2.15.2.2409.01' into feature/2.15.2.2409.01合并业务线测试
# Conflicts:
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileImportDialog/index.js
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileList/index.js
# pc4mobx/hrmSalary/pages/variableSalary/components/searchPannel/index.js
# pc4mobx/hrmSalary/pages/variableSalary/index.js
# pc4mobx/hrmSalary/pages/variableSalary/index.less
|
2024-10-16 11:11:23 +08:00 |
|
lys
|
bee1d73eb7
|
release/2.15.2.2409.01
|
2024-10-15 16:33:26 +08:00 |
|
黎永顺
|
b954e1696e
|
release/2.15.2.2409.01
|
2024-10-14 16:02:12 +08:00 |
|
黎永顺
|
7980acc6c2
|
release/2.15.2.2409.01
|
2024-10-14 14:20:02 +08:00 |
|
黎永顺
|
99a011722d
|
custom/custom/鹰图软件
|
2024-10-12 17:22:15 +08:00 |
|
黎永顺
|
2f8d5cc74a
|
Merge branch 'release/2.15.2.2409.01' into custom/领悦
# Conflicts:
# pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiLeft.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiRight.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserOperation.js
# pc4mobx/hrmSalary/components/CustomBrowser/index.js
# pc4mobx/hrmSalary/components/CustomBrowser/index.less
# pc4mobx/hrmSalary/index.js
|
2024-10-12 16:33:54 +08:00 |
|
黎永顺
|
5c8e6b8133
|
Merge branch 'release/2.15.2.2409.01' into feature/2.15.2.2409.01合并业务线测试
# Conflicts:
# pc4mobx/hrmSalary/pages/analysisOfSalaryStatistics/index.js
# pc4mobx/hrmSalary/pages/variableSalary/index.js
# pc4mobx/hrmSalary/stores/taxAgent.js
|
2024-10-12 16:05:19 +08:00 |
|
黎永顺
|
29122e2434
|
Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试
|
2024-10-12 16:02:19 +08:00 |
|
黎永顺
|
1b8ff1030c
|
Merge branch 'custom/领悦' into custom/领悦业务线
# Conflicts:
# pc4mobx/hrmSalary/pages/custom-pages/lingyue/vouncherSummary/index.js
|
2024-10-12 15:49:49 +08:00 |
|
黎永顺
|
9d06793a04
|
custom/领悦
|
2024-10-12 15:32:42 +08:00 |
|
黎永顺
|
48df3121fd
|
custom/领悦
|
2024-10-12 15:31:39 +08:00 |
|
黎永顺
|
2b541a85df
|
Merge branch 'feature/2.15.2.2409.01-薪酬统计薪资明细默认显示列' into release/2.15.2.2409.01
|
2024-10-12 13:39:15 +08:00 |
|
黎永顺
|
925394e814
|
custom/领悦
|
2024-10-12 13:38:20 +08:00 |
|
黎永顺
|
5b3a645dfc
|
release/2.15.2.2409.01
|
2024-10-12 10:07:36 +08:00 |
|
黎永顺
|
591f29d934
|
release/2.15.2.2409.01
|
2024-10-11 17:15:11 +08:00 |
|
黎永顺
|
0754316e77
|
feature/2.15.2.2409.01-薪酬统计薪资明细默认显示列
|
2024-10-11 17:13:19 +08:00 |
|
黎永顺
|
90470c3a57
|
feature/2.15.2.2409.01-薪酬统计薪资明细默认显示列
|
2024-10-11 17:06:54 +08:00 |
|
黎永顺
|
167c2c5a20
|
feature/2.15.1.2407.01-权限
|
2024-10-11 15:19:38 +08:00 |
|
黎永顺
|
c72d34fb9a
|
feature/2.15.1.2407.01-权限
|
2024-10-11 11:11:06 +08:00 |
|
黎永顺
|
6aa662d432
|
feature/2.15.1.2407.01-权限
|
2024-10-11 10:01:46 +08:00 |
|
黎永顺
|
44fb334837
|
custom/领悦
|
2024-10-10 16:29:36 +08:00 |
|
黎永顺
|
bdd4b4e446
|
release/2.15.2.2409.01
|
2024-10-10 15:32:41 +08:00 |
|
黎永顺
|
ca3c9079a1
|
release/2.15.2.2409.01
|
2024-10-10 13:57:09 +08:00 |
|
黎永顺
|
ab7d0c1f7f
|
release/2.15.2.2409.01
|
2024-10-09 18:12:06 +08:00 |
|
黎永顺
|
cd768fff67
|
feature/2.15.1.2407.01-权限
|
2024-10-09 17:02:14 +08:00 |
|
黎永顺
|
01ef84368d
|
Merge branch 'hotfix/2.15.1.2409.01' into release/2.15.2.2409.01
|
2024-10-09 14:55:29 +08:00 |
|
黎永顺
|
307f954eac
|
feature/2.15.1.2407.01-权限
|
2024-10-09 14:55:11 +08:00 |
|
黎永顺
|
94a4d3a930
|
feature/2.15.1.2407.01-权限
|
2024-10-09 14:51:55 +08:00 |
|
黎永顺
|
215094dac8
|
release/2.15.2.2409.01
|
2024-10-09 11:25:50 +08:00 |
|
黎永顺
|
b23662c09e
|
feature/2.15.1.2407.01-权限
|
2024-10-09 11:10:21 +08:00 |
|
黎永顺
|
255e8d8760
|
feature/2.15.1.2407.01-权限
|
2024-10-09 10:22:00 +08:00 |
|
黎永顺
|
dd82ecf445
|
feature/2.15.1.2407.01-权限
|
2024-10-08 17:57:10 +08:00 |
|
黎永顺
|
bd93223774
|
hotfix/2.15.1.2409.01
规则设置添加薪资报表中的组织信息设置切换功能
|
2024-10-08 15:08:00 +08:00 |
|
黎永顺
|
f55898b8a0
|
feature/2.15.1.2407.01-权限
|
2024-10-08 14:29:24 +08:00 |
|
黎永顺
|
f6789a0ea8
|
feature/2.15.1.2407.01-权限
|
2024-10-08 14:08:16 +08:00 |
|
黎永顺
|
53d45c2069
|
hotfix/2.15.1.2409.01
规则设置修改
|
2024-10-08 13:21:55 +08:00 |
|
黎永顺
|
d73372e5c4
|
feature/2.15.1.2407.01-权限
|
2024-10-08 10:07:23 +08:00 |
|
黎永顺
|
e92f06bce2
|
Merge branch 'release/2.15.2.2409.01' into feature/2.15.2.2409.01合并业务线测试
|
2024-09-30 10:30:46 +08:00 |
|
黎永顺
|
3107914834
|
Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试
|
2024-09-30 10:30:32 +08:00 |
|
黎永顺
|
9c318d22b7
|
hotfix/2.15.1.2409.01
|
2024-09-29 10:57:22 +08:00 |
|
黎永顺
|
c7a1b1e321
|
Merge branch 'feature/2.15.1.2407.01-权限' into custom/领悦业务线
|
2024-09-27 18:42:40 +08:00 |
|
黎永顺
|
198668654a
|
feature/2.15.1.2407.01-权限
|
2024-09-27 18:38:37 +08:00 |
|
黎永顺
|
0683625850
|
Merge branch 'feature/2.15.1.2407.01-浮动薪酬' into feature/2.15.1.2407.01-权限
# Conflicts:
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryItemList/index.js
# pc4mobx/hrmSalary/pages/variableSalary/index.js
|
2024-09-27 18:35:25 +08:00 |
|
黎永顺
|
d4763dc2d2
|
feature/2.15.1.2407.01-权限
|
2024-09-27 18:30:31 +08:00 |
|
黎永顺
|
ce711f9c97
|
feature/2.15.1.2407.01-权限
|
2024-09-27 16:45:47 +08:00 |
|
黎永顺
|
6c99d5fbad
|
Merge branch 'feature/2.15.1.2407.01-浮动薪酬' into feature/2.15.1.2407.01-权限
|
2024-09-27 16:21:35 +08:00 |
|
黎永顺
|
8996fa8d79
|
feature/2.15.1.2407.01-权限
|
2024-09-27 16:20:28 +08:00 |
|
黎永顺
|
b4a966ea20
|
feature/2.15.1.2407.01-权限
|
2024-09-27 15:32:21 +08:00 |
|
黎永顺
|
e5d43e7dc5
|
feature/2.15.1.2407.01-权限
|
2024-09-27 13:38:48 +08:00 |
|
黎永顺
|
9a33cc96c6
|
Merge branch 'feature/2.15.2.2409.01合并业务线测试' into custom/领悦业务线
|
2024-09-26 18:04:11 +08:00 |
|
黎永顺
|
5d5215609a
|
Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试
|
2024-09-26 17:59:43 +08:00 |
|
黎永顺
|
e09fbb332f
|
feature/2.15.1.2407.01-权限
|
2024-09-26 17:59:14 +08:00 |
|
黎永顺
|
f1183af3e2
|
feature/2.15.1.2407.01-权限
|
2024-09-26 17:56:41 +08:00 |
|
黎永顺
|
929f285be2
|
feature/2.15.1.2407.01-权限
|
2024-09-26 17:50:15 +08:00 |
|
黎永顺
|
143d2ef8f8
|
Merge branch 'feature/2.15.2.2409.01合并业务线测试' into custom/领悦业务线
# Conflicts:
# pc4mobx/hrmSalary/components/CustomBrowser/components/associativeSearchMult.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserDialog.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiLeft.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserMutiRight.js
# pc4mobx/hrmSalary/components/CustomBrowser/components/customBrowserOperation.js
# pc4mobx/hrmSalary/components/CustomBrowser/index.js
# pc4mobx/hrmSalary/components/CustomBrowser/index.less
# pc4mobx/hrmSalary/index.js
|
2024-09-26 17:27:24 +08:00 |
|
黎永顺
|
8c19e33592
|
Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试
|
2024-09-26 17:09:42 +08:00 |
|
黎永顺
|
666ec8f9be
|
feature/2.15.1.2407.01-权限
|
2024-09-26 17:06:08 +08:00 |
|
黎永顺
|
5093ff88a7
|
Merge branch 'feature/2.15.1.2407.01-权限' into feature/2.15.2.2409.01合并业务线测试
|
2024-09-26 10:06:14 +08:00 |
|
黎永顺
|
112988ceba
|
feature/2.15.1.2407.01-权限
|
2024-09-26 10:01:49 +08:00 |
|
黎永顺
|
a7e67b9358
|
Merge branch 'feature/2.15.1.2407.01-薪资项目以及字段管理页面改造' into feature/2.15.1.2407.01-权限
# Conflicts:
# pc4mobx/hrmSalary/pages/salaryItem/index.js
|
2024-09-25 18:01:35 +08:00 |
|
黎永顺
|
5ec07d20e0
|
feature/2.15.1.2407.01-薪资项目以及字段管理页面改造
|
2024-09-25 15:37:02 +08:00 |
|
黎永顺
|
a4fffbcbd4
|
release/2.15.2.2409.01
|
2024-09-25 14:11:46 +08:00 |
|
黎永顺
|
f2b17872f7
|
release/2.15.2.2409.01
|
2024-09-25 11:12:53 +08:00 |
|
黎永顺
|
32940c9bcf
|
feature/2.15.1.2407.01-权
|
2024-09-25 10:46:55 +08:00 |
|
黎永顺
|
fd188c9f51
|
feature/2.15.1.2407.01-权限
|
2024-09-25 10:02:46 +08:00 |
|
黎永顺
|
2d15f19ddd
|
custom/西安秦华天燃气
|
2024-09-24 16:49:45 +08:00 |
|
黎永顺
|
fd067b653f
|
feature/2.15.1.2407.01-薪资项目以及字段管理页面改造
|
2024-09-24 10:53:41 +08:00 |
|
黎永顺
|
2664903959
|
release/2.15.2.2409.01
|
2024-09-23 16:25:46 +08:00 |
|
黎永顺
|
7821a990e9
|
custom/领悦
|
2024-09-23 16:18:58 +08:00 |
|
黎永顺
|
efa75925ad
|
权限
|
2024-09-23 16:15:22 +08:00 |
|
黎永顺
|
f6f3a42333
|
权限
|
2024-09-23 10:37:10 +08:00 |
|
黎永顺
|
02b085c051
|
权限
|
2024-09-20 16:30:12 +08:00 |
|
黎永顺
|
e9abaa26bb
|
权限
|
2024-09-19 10:36:04 +08:00 |
|
黎永顺
|
f1f4258090
|
feature/2.15.1.2407.01-权限
|
2024-09-14 18:01:11 +08:00 |
|
黎永顺
|
4999cc12bf
|
Merge branch 'release/2.15.2.2409.01' into feature/2.15.1.2407.01-权限
|
2024-09-14 15:55:46 +08:00 |
|
黎永顺
|
15cc213c8c
|
custom/大成
|
2024-09-14 15:52:12 +08:00 |
|
黎永顺
|
b597bdd2bb
|
feature/2.15.1.2407.01-权限
|
2024-09-14 14:28:58 +08:00 |
|
黎永顺
|
1ea3529b5a
|
custom/领悦
|
2024-09-14 13:56:02 +08:00 |
|
黎永顺
|
50a73b29eb
|
feature/2.15.1.2407.01-权限
|
2024-09-14 13:31:45 +08:00 |
|
黎永顺
|
1dca1d7268
|
feature/2.15.1.2407.01-权限
|
2024-09-14 13:31:12 +08:00 |
|
黎永顺
|
5de04424d2
|
feature/2.15.1.2407.01-权限
|
2024-09-14 13:18:18 +08:00 |
|
黎永顺
|
6928f89df6
|
feature/2.15.1.2407.01-权限
|
2024-09-14 11:41:31 +08:00 |
|
黎永顺
|
1c1aac66d7
|
hotfix/2.15.1.2409.01
浮动薪酬模块页面样式调整
|
2024-09-14 11:15:25 +08:00 |
|
黎永顺
|
c738ba0c6f
|
Merge branch 'release/2.15.2.2409.01' into hotfix/2.15.1.2409.01
|
2024-09-14 10:43:55 +08:00 |
|
黎永顺
|
3bbe58562c
|
custom/领悦
|
2024-09-14 10:42:45 +08:00 |
|
黎永顺
|
658f4fa64f
|
custom/领悦
|
2024-09-14 09:55:54 +08:00 |
|
黎永顺
|
7ac7a58f7e
|
Merge branch 'release/2.15.2.2409.01' into feature/2.15.1.2407.01-权限
|
2024-09-13 17:35:58 +08:00 |
|
黎永顺
|
3f65ce2e1c
|
custom/领悦
|
2024-09-13 17:35:14 +08:00 |
|
黎永顺
|
f780662b1b
|
hotfix/2.15.1.2407.01
|
2024-09-13 15:52:15 +08:00 |
|
黎永顺
|
99ebca78d0
|
hotfix/2.15.1.2407.01
|
2024-09-13 15:45:43 +08:00 |
|
黎永顺
|
f6e9153e3a
|
custom/领悦
|
2024-09-13 15:22:16 +08:00 |
|
黎永顺
|
d7b1c173c2
|
feature/2.15.1.2407.01-权限
|
2024-09-13 14:11:26 +08:00 |
|
黎永顺
|
687371ab39
|
Merge branch 'feature/2.15.1.2407.01-浮动薪酬' into release/2.15.2.2409.01
# Conflicts:
# pc4mobx/hrmSalary/index.js
|
2024-09-13 11:18:48 +08:00 |
|
黎永顺
|
3f0502aabf
|
feature/2.15.1.2407.01-权限
|
2024-09-13 11:12:53 +08:00 |
|
黎永顺
|
85cdbbe8b2
|
custom/大成
|
2024-09-12 17:50:19 +08:00 |
|
黎永顺
|
4a386102ef
|
feature/2.15.1.2407.01-权限
|
2024-09-12 16:34:39 +08:00 |
|
黎永顺
|
3c33fc7a3a
|
feature/2.15.1.2407.01-权限
|
2024-09-12 13:53:47 +08:00 |
|
黎永顺
|
394d7152f4
|
feature/2.15.1.2407.01-权限
|
2024-09-12 13:13:51 +08:00 |
|
黎永顺
|
b99a2069d4
|
feature/2.15.1.2407.01-权限
|
2024-09-11 18:37:01 +08:00 |
|
黎永顺
|
6586f68d58
|
Merge branch 'release/2.15.1.2407.01' into feature/2.15.1.2407.01-权限
|
2024-09-10 16:34:12 +08:00 |
|
黎永顺
|
c07a43b8f8
|
feature/2.15.1.2407.01-权限
|
2024-09-10 16:33:21 +08:00 |
|
黎永顺
|
66f6cbc403
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-09-10 12:54:45 +08:00 |
|
黎永顺
|
3fae1f1a9d
|
hotfix/2.15.1.2407.01
|
2024-09-10 12:52:25 +08:00 |
|
黎永顺
|
e8d0006cbb
|
feature/2.15.1.2407.01-权限
|
2024-09-10 12:50:40 +08:00 |
|
黎永顺
|
9759a529f5
|
feature/2.15.1.2407.01-权限
|
2024-09-10 12:23:18 +08:00 |
|
黎永顺
|
34bf2c8c52
|
feature/2.15.1.2407.01-权限
|
2024-09-09 09:35:02 +08:00 |
|
黎永顺
|
a56ee784db
|
feature/2.15.1.2407.01-权限
|
2024-09-06 15:45:57 +08:00 |
|
黎永顺
|
2be7896e4e
|
custom/领悦
|
2024-09-06 14:16:34 +08:00 |
|
黎永顺
|
a729826c8d
|
feature/2.15.1.2407.01-权限
|
2024-09-06 14:15:39 +08:00 |
|
黎永顺
|
6e3d716afd
|
feature/2.15.1.2407.01-权限
|
2024-09-06 13:30:09 +08:00 |
|
黎永顺
|
5a494893c7
|
custom/领悦
|
2024-09-06 13:18:52 +08:00 |
|
黎永顺
|
4976f29240
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-09-05 10:13:37 +08:00 |
|
黎永顺
|
76da4dd1e1
|
hotfix/2.15.1.2407.01
|
2024-09-05 10:13:03 +08:00 |
|
黎永顺
|
2064cc4111
|
custom/领悦
|
2024-09-05 10:07:22 +08:00 |
|
黎永顺
|
724c4bb53b
|
feature/2.15.1.2407.01-权限
|
2024-09-03 16:34:22 +08:00 |
|
黎永顺
|
64c56fc280
|
custom/领悦
|
2024-09-03 16:19:42 +08:00 |
|
黎永顺
|
841be03462
|
Merge branch 'feature/2.15.1.2407.01-社保档案保存校验' into release/2.15.1.2407.01
|
2024-09-03 09:24:02 +08:00 |
|
黎永顺
|
4385b8c6b2
|
custom/领悦
|
2024-09-02 14:00:22 +08:00 |
|
黎永顺
|
f843a8cc32
|
custom/领悦
|
2024-08-30 14:22:23 +08:00 |
|
黎永顺
|
5717c1e635
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-30 13:42:43 +08:00 |
|
黎永顺
|
bf197d455e
|
hotfix/2.15.1.2407.01
薪酬统计报表数据穿透接口参数修改
|
2024-08-30 13:42:21 +08:00 |
|
黎永顺
|
1fb7b07b22
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-29 15:28:23 +08:00 |
|
黎永顺
|
21ead59420
|
hotfix/2.15.1.2407.01
|
2024-08-29 15:21:37 +08:00 |
|
黎永顺
|
9f2f7f0678
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-29 09:46:07 +08:00 |
|
黎永顺
|
7de7d189ae
|
custom/领悦
|
2024-08-28 17:06:15 +08:00 |
|
黎永顺
|
e333c34ff4
|
custom/领悦
|
2024-08-28 16:25:15 +08:00 |
|
黎永顺
|
4810a09f29
|
hotfix/2.15.1.2407.01
|
2024-08-28 14:57:34 +08:00 |
|
黎永顺
|
fe0cd8e541
|
custom/领悦
|
2024-08-28 14:46:00 +08:00 |
|
黎永顺
|
c25586045a
|
custom/领悦
|
2024-08-28 13:42:32 +08:00 |
|
黎永顺
|
8f6f762a44
|
custom/领悦
|
2024-08-22 17:53:18 +08:00 |
|
黎永顺
|
772ef95416
|
custom/领悦
|
2024-08-22 17:40:15 +08:00 |
|
黎永顺
|
69fd955592
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-22 15:44:34 +08:00 |
|
黎永顺
|
b91f35418e
|
feature/2.15.1.2407.01-权限
|
2024-08-22 15:42:35 +08:00 |
|
黎永顺
|
b0d790f988
|
feature/2.15.1.2407.01-权限
|
2024-08-21 16:00:28 +08:00 |
|
黎永顺
|
cc81d8c9bd
|
feature/2.15.1.2407.01-权限
|
2024-08-20 18:07:03 +08:00 |
|
黎永顺
|
b7c5ae22f3
|
feature/2.15.1.2407.01-权限
|
2024-08-20 16:48:02 +08:00 |
|
黎永顺
|
848282cfc8
|
feature/2.15.1.2407.01-薪资项目以及字段管理页面改造
|
2024-08-20 15:35:33 +08:00 |
|
黎永顺
|
673c2ba908
|
feature/2.15.1.2407.01-薪资项目以及字段管理页面改造
|
2024-08-20 15:27:03 +08:00 |
|
黎永顺
|
fdf82d883d
|
feature/2.15.1.2407.01-薪资项目以及字段管理页面改造
|
2024-08-20 14:10:27 +08:00 |
|
黎永顺
|
50b4426a75
|
feature/2.15.1.2407.01-薪资项目以及字段管理页面改造
|
2024-08-20 14:02:33 +08:00 |
|
黎永顺
|
421fca99cc
|
Merge branch 'feature/2.15.1.2407.01-导入工具' into release/2.15.1.2407.01
|
2024-08-20 13:37:39 +08:00 |
|
黎永顺
|
f03c187796
|
feature/2.15.1.2407.01-薪资项目以及字段管理页面改造
|
2024-08-20 13:37:09 +08:00 |
|
黎永顺
|
aaf2914e20
|
feature/2.15.1.2407.01-薪资项目以及字段管理页面改造
|
2024-08-20 11:25:09 +08:00 |
|
黎永顺
|
b932d4dd19
|
feature/2.15.1.2407.01-薪资项目以及字段管理页面改造
|
2024-08-20 11:09:29 +08:00 |
|
黎永顺
|
3cff712ae9
|
feature/2.15.1.2407.01-薪资项目以及字段管理页面改造
|
2024-08-20 10:35:32 +08:00 |
|
黎永顺
|
c0b517201f
|
feature/2.15.1.2407.01-社保档案保存校验
|
2024-08-20 10:07:29 +08:00 |
|
黎永顺
|
63eb373025
|
hotfix/2.15.1.2407.01
|
2024-08-20 09:23:41 +08:00 |
|
黎永顺
|
96f6135aba
|
hotfix/2.15.1.2407.01
|
2024-08-19 17:32:49 +08:00 |
|
黎永顺
|
b7e29df781
|
feature/2.15.1.2407.01-导入工具
|
2024-08-19 16:39:14 +08:00 |
|
黎永顺
|
55d39d6523
|
feature/2.15.1.2407.01-社保档案保存校验
|
2024-08-19 16:37:46 +08:00 |
|
黎永顺
|
a3f40f506d
|
hotfix/2.15.1.2407.01
|
2024-08-19 16:28:53 +08:00 |
|
黎永顺
|
dfcd27771f
|
feature/2.15.1.2407.01-社保档案保存校验
|
2024-08-19 15:01:53 +08:00 |
|
黎永顺
|
d31ae5a030
|
feature/2.15.1.2407.01-导入工具
|
2024-08-19 10:43:30 +08:00 |
|
黎永顺
|
6a56cee090
|
feature/2.15.1.2407.01-导入工具
|
2024-08-19 10:42:54 +08:00 |
|
黎永顺
|
1d26ef8176
|
feature/2.15.1.2407.01-导入工具
|
2024-08-19 10:27:02 +08:00 |
|
黎永顺
|
a101de8355
|
feature/2.15.1.2407.01-薪资项目以及字段管理页面改造
|
2024-08-19 09:10:47 +08:00 |
|
黎永顺
|
6ec8cb76ce
|
feature/2.15.1.2407.01-薪资项目以及字段管理页面改造
|
2024-08-16 17:06:42 +08:00 |
|
黎永顺
|
f730cba8de
|
feature/2.15.1.2407.01-导入工具
|
2024-08-16 16:37:45 +08:00 |
|
黎永顺
|
b9e7b37439
|
feature/2.15.1.2407.01-薪资项目以及字段管理页面改造
|
2024-08-16 16:19:21 +08:00 |
|
黎永顺
|
d1fc6e4ea0
|
feature/2.15.1.2407.01-薪资项目以及字段管理页面改造
|
2024-08-16 16:19:00 +08:00 |
|
黎永顺
|
fd3d8b5ec4
|
feature/2.15.1.2407.01-薪资项目以及字段管理页面改造
|
2024-08-16 16:18:08 +08:00 |
|
黎永顺
|
87aa53955f
|
feature/2.15.1.2407.01-薪资项目以及字段管理页面改造
|
2024-08-16 15:05:51 +08:00 |
|
黎永顺
|
3d55619813
|
hotfix/2.15.1.2407.01
|
2024-08-15 17:43:03 +08:00 |
|
黎永顺
|
e8625fd0ef
|
feature/2.15.1.2407.01-导入工具
|
2024-08-15 16:29:21 +08:00 |
|
黎永顺
|
ae665fb72d
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-15 16:01:00 +08:00 |
|
黎永顺
|
5009cd5955
|
hotfix/2.15.1.2407.01
|
2024-08-15 15:43:52 +08:00 |
|
黎永顺
|
4be61e9179
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-15 15:24:00 +08:00 |
|
黎永顺
|
37f7a3bd6b
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-15 11:05:09 +08:00 |
|
黎永顺
|
5c9f954adb
|
hotfix/2.15.1.2407.01
|
2024-08-15 11:04:14 +08:00 |
|
黎永顺
|
f984cd3f59
|
hotfix/2.15.1.2407.01
|
2024-08-15 11:01:26 +08:00 |
|
黎永顺
|
23e9a6ba42
|
hotfix/2.15.1.2407.01
|
2024-08-15 10:28:18 +08:00 |
|
黎永顺
|
bbc11b0609
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-14 11:26:00 +08:00 |
|
黎永顺
|
54352aad95
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-13 17:58:28 +08:00 |
|
黎永顺
|
44c63e874a
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-13 16:14:28 +08:00 |
|
黎永顺
|
d9fc164504
|
hotfix/2.15.1.2407.01
|
2024-08-13 16:12:43 +08:00 |
|
黎永顺
|
9479a4ba9a
|
feature/2.15.1.2407.01-导入工具
|
2024-08-13 14:33:10 +08:00 |
|
黎永顺
|
a2c1fbd485
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-08-12 16:57:53 +08:00 |
|
黎永顺
|
74ba398c90
|
feature/2.15.1.2407.01-导入工具
|
2024-08-12 16:56:51 +08:00 |
|
黎永顺
|
f05c43d011
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-12 14:58:36 +08:00 |
|
黎永顺
|
df2283d0f4
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-12 11:12:10 +08:00 |
|
黎永顺
|
4a5f5b6e7a
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-12 09:56:58 +08:00 |
|
黎永顺
|
8c038c8d74
|
Merge branch 'hotfix/2.15.1.2407.01' into feature/2.15.1.2407.01-浮动薪酬
|
2024-08-12 09:27:43 +08:00 |
|
黎永顺
|
9d99557f4b
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-12 09:24:11 +08:00 |
|
黎永顺
|
86de787ed4
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-08 18:24:45 +08:00 |
|
黎永顺
|
70fe54efb7
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-08 17:32:54 +08:00 |
|
黎永顺
|
36d90b35a6
|
feature/2.15.1.2407.01-浮动薪酬
|
2024-08-08 14:36:11 +08:00 |
|
黎永顺
|
71b4e766af
|
feature/2.15.1.2407.01-权限
|
2024-08-08 11:10:24 +08:00 |
|
黎永顺
|
75b6c0969a
|
feature/2.15.1.2407.01-导入工具
|
2024-08-07 15:22:10 +08:00 |
|
黎永顺
|
99d93b041e
|
hotfix/2.15.1.2407.01
|
2024-08-07 14:05:32 +08:00 |
|
黎永顺
|
6e7137b6b3
|
feature/2.15.1.2407.01-权限
|
2024-08-07 14:02:27 +08:00 |
|
黎永顺
|
334a582d62
|
hotfix/2.15.1.2407.01
考勤引用，薪资账套多选
|
2024-08-07 11:11:53 +08:00 |
|
黎永顺
|
2dc1061fa2
|
feature/2.15.1.2407.01-权限
|
2024-08-07 09:02:12 +08:00 |
|
黎永顺
|
531e975820
|
feature/2.15.1.2407.01-权限
|
2024-08-05 16:16:21 +08:00 |
|
黎永顺
|
b0ac071035
|
feature/2.15.1.2407.01-权限
|
2024-08-05 15:32:23 +08:00 |
|
黎永顺
|
42bc94e720
|
feature/2.15.1.2407.01-权限
|
2024-08-05 15:06:07 +08:00 |
|
黎永顺
|
25b7a2341e
|
hotfix/2.15.1.2407.01
|
2024-08-05 11:05:25 +08:00 |
|
黎永顺
|
d09c5f1d96
|
Merge branch 'hotfix/2.15.1.2407.01' into release/2.15.1.2407.01
|
2024-07-26 17:31:53 +08:00 |
|
黎永顺
|
964af55e3a
|
hotfix/2.15.1.2407.01
|
2024-07-26 10:02:35 +08:00 |
|
黎永顺
|
d3ad76f711
|
hotfix/2.15.1.2407.01
|
2024-07-23 11:15:05 +08:00 |
|
黎永顺
|
c16272755a
|
release/2.15.1.2407.01
|
2024-07-19 14:07:45 +08:00 |
|
黎永顺
|
6a33d3d99c
|
hotfix/2.15.1.2407.01
|
2024-07-19 10:52:09 +08:00 |
|
黎永顺
|
892114dbc2
|
hotfix/2.15.1.2407.01
|
2024-07-18 15:37:30 +08:00 |
|
黎永顺
|
af8a0a1bab
|
hotfix/2.15.1.2407.01
|
2024-07-16 15:59:38 +08:00 |
|
黎永顺
|
cff964c7f1
|
feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能
|
2024-07-16 11:10:48 +08:00 |
|
黎永顺
|
adf8b1bddc
|
feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能
|
2024-07-16 09:31:56 +08:00 |
|
黎永顺
|
fef6bac256
|
feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能
|
2024-07-16 09:15:53 +08:00 |
|
黎永顺
|
5f5d6f95de
|
feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能
|
2024-07-15 18:45:56 +08:00 |
|
黎永顺
|
0628c1499b
|
feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能
|
2024-07-15 18:42:26 +08:00 |
|
黎永顺
|
6d73b146c4
|
feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能
|
2024-07-15 18:18:57 +08:00 |
|
黎永顺
|
b349327088
|
feature/2.14.5.2406.03-工资单查看详情列表添加自定义列的功能
|
2024-07-15 17:14:55 +08:00 |