 lys
|
6a4f9cd2af
|
Merge branch 'feature/2.15.2.2411.01业务线' into feature/2.15.2.2411.01业务线-数据推送
|
2024-12-27 09:16:26 +08:00 |
|
lys
|
322e6a9f96
|
Merge branch 'release/2.18.2.2412.02' into feature/2.15.2.2411.01业务线
|
2024-12-27 09:16:05 +08:00 |
|
lys
|
8aa696fee5
|
release/2.18.2.2412.02
|
2024-12-27 09:12:09 +08:00 |
|
lys
|
cec22dc89f
|
release/2.18.2.2412.02
|
2024-12-24 15:41:15 +08:00 |
|
lys
|
8da06ed9ae
|
Merge branch 'release/2.18.1.2412.01' into feature/2.15.2.2411.01业务线
# Conflicts:
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
# pc4mobx/hrmSalary/pages/socialSecurityBenefits/standingBook/standingBook.js
|
2024-12-10 14:06:09 +08:00 |
|
lys
|
a46f4869e5
|
Merge branch 'release/2.17.1.2411.01' into feature/2.15.2.2411.01业务线-数据推送
# Conflicts:
# pc4mobx/hrmSalary/pages/dataAcquisition/cumDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/cumSituation/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/otherDeduct/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/specialAddDeduction/index.js
|
2024-12-09 15:22:49 +08:00 |
|
lys
|
5d817c9594
|
feature/2.17.1.2411.01-薪酬报表薪资明细显示模式
|
2024-12-04 15:42:49 +08:00 |
|
lys
|
f771d2eacc
|
feature/2.17.1.2411.01-薪酬报表薪资明细显示模式
|
2024-12-04 10:46:25 +08:00 |
|
lys
|
b61dc20db5
|
feature/2.17.1.2411.01-薪酬报表薪资明细显示模式
|
2024-12-03 18:38:14 +08:00 |
|
lys
|
64777b4129
|
Merge branch 'release/2.17.1.2411.01' into feature/2.15.2.2411.01业务线
# Conflicts:
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
# pc4mobx/hrmSalary/util/index.js
|
2024-12-03 13:21:36 +08:00 |
|
lys
|
b0b67230ce
|
release/2.17.1.2411.01
|
2024-11-27 14:42:04 +08:00 |
|
lys
|
9618a9b5d3
|
release/2.17.1.2411.01
|
2024-11-26 17:01:50 +08:00 |
|
lys
|
a048a561a5
|
release/2.17.1.2411.01
|
2024-11-26 14:56:03 +08:00 |
|
lys
|
179e58357d
|
Merge branch 'release/2.17.1.2411.01' into feature/2.15.2.2411.01业务线-数据推送
# Conflicts:
# pc4mobx/hrmSalary/pages/variableSalary/components/salaryFileDialog/index.js
# pc4mobx/hrmSalary/util/index.js
|
2024-11-26 14:40:33 +08:00 |
|
lys
|
571026ebf8
|
feature/2.15.2.2411.01业务线-数据推送
|
2024-11-21 14:10:47 +08:00 |
|
lys
|
8a0998e26c
|
release/2.17.1.2411.01
|
2024-11-19 10:54:33 +08:00 |
|
lys
|
4473d8dad5
|
feature/2.15.2.2411.01业务线-数据推送
|
2024-11-19 09:56:29 +08:00 |
|
lys
|
5014859171
|
Merge branch 'release/2.17.1.2411.01' into feature/测试
# Conflicts:
# pc4mobx/hrmSalary/index.js
# pc4mobx/hrmSalary/pages/dataAcquisition/dataTables.js
# pc4mobx/hrmSalary/pages/dataAcquisition/layout.js
# pc4mobx/hrmSalary/pages/ledgerPage/components/ledgerSlide.js
# pc4mobx/hrmSalary/pages/payrollRelease/components/payrollTemplateTableList/index.js
# pc4mobx/hrmSalary/pages/salaryItem/customSalaryItemSlide.js
# pc4mobx/hrmSalary/pages/salaryItem/index.js
|
2024-11-15 15:06:16 +08:00 |
|
lys
|
3654e2a378
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-11 14:43:17 +08:00 |
|
lys
|
97a5d37044
|
feature/2.16.1.2410.01-薪酬统计报表薪资明细添加模板切换和模板创建功能
|
2024-11-07 16:06:48 +08:00 |
|
lys
|
83d14f6d82
|
release/2.16.1.2410.01
日志组件优化
|
2024-11-05 17:33:34 +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
|
1f7fe615be
|
1release/2.16.1.2410.01
|
2024-11-01 14:50:37 +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 |
|
黎永顺
|
5b3a645dfc
|
release/2.15.2.2409.01
|
2024-10-12 10:07:36 +08:00 |
|
黎永顺
|
90470c3a57
|
feature/2.15.2.2409.01-薪酬统计薪资明细默认显示列
|
2024-10-11 17:06:54 +08:00 |
|
黎永顺
|
255e8d8760
|
feature/2.15.1.2407.01-权限
|
2024-10-09 10:22:00 +08:00 |
|
黎永顺
|
b4a966ea20
|
feature/2.15.1.2407.01-权限
|
2024-09-27 15:32:21 +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 |
|
黎永顺
|
02b085c051
|
权限
|
2024-09-20 16:30:12 +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 |
|
黎永顺
|
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 |
|
黎永顺
|
421fca99cc
|
Merge branch 'feature/2.15.1.2407.01-导入工具' into release/2.15.1.2407.01
|
2024-08-20 13:37:39 +08:00 |
|
黎永顺
|
b7e29df781
|
feature/2.15.1.2407.01-导入工具
|
2024-08-19 16:39:14 +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 |
|
黎永顺
|
f730cba8de
|
feature/2.15.1.2407.01-导入工具
|
2024-08-16 16:37:45 +08:00 |
|
黎永顺
|
e8625fd0ef
|
feature/2.15.1.2407.01-导入工具
|
2024-08-15 16:29:21 +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 |
|
黎永顺
|
9479a4ba9a
|
feature/2.15.1.2407.01-导入工具
|
2024-08-13 14:33:10 +08:00 |
|
黎永顺
|
74ba398c90
|
feature/2.15.1.2407.01-导入工具
|
2024-08-12 16:56:51 +08:00 |
|
黎永顺
|
add6a70abd
|
hotfix/2.14.2.2406.02
|
2024-06-17 16:17:16 +08:00 |