Commit Graph

17 Commits

Author SHA1 Message Date
lys 1011b981d1 Merge branch 'release/2.19.1.2501.01' into custom/领悦业务线 2025-04-14 16:39:17 +08:00
lys 80307c7b91 release/2.19.1.2501.01 2025-04-14 16:38:41 +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 bd81fe44b2 release/2.16.1.2410.01
薪资档案添加调薪日期的泛微选择
2024-11-07 16:15:45 +08:00
黎永顺 b99a2069d4 feature/2.15.1.2407.01-权限 2024-09-11 18:37:01 +08:00
黎永顺 da6a8266f6 hotfix/2.14.2.2406.02 2024-06-26 10:02:45 +08:00
黎永顺 a04be74c9c hotfix/2.12.1.2404.02 2024-05-13 17:06:41 +08:00
黎永顺 342aeed953 多语言bug 2024-04-02 17:45:59 +08:00
黎永顺 f732bcaafb Merge branch 'feature/2.10.1.2401.01-页面操作日志添加' into release/2.10.1.2402.01
# Conflicts:
#	pc4mobx/hrmSalary/pages/mySalaryBenefits/index.js
#	pc4mobx/hrmSalary/pages/socialSecurityBenefits/welfareArchive/index.js
#	pc4mobx/hrmSalary/stores/baseForm.js
2024-03-05 14:38:57 +08:00
黎永顺 194e575e25 hotfix/2.10.1.2402.01 2024-02-27 16:33:50 +08:00
黎永顺 a6f382a36b feature/2.10.1.2401.01-页面操作日志添加 2024-01-31 10:24:15 +08:00
黎永顺 30c73ccf88 feature/2.9.10.2312.02-薪资档案页面重构 2024-01-15 18:18:26 +08:00
黎永顺 252d4e0ff7 feature/2.9.10.2312.02-薪资档案页面重构 2024-01-09 17:42:40 +08:00
黎永顺 c01c03f1b0 feature/2.9.10.2312.02-薪资档案页面重构 2024-01-08 16:05:00 +08:00
黎永顺 a1b8fc3f51 非系统人员管理开发 2023-03-16 18:32:24 +08:00
黎永顺 e14ebaacad 非系统人员管理开发 2023-03-15 14:21:26 +08:00
18652063575 d7fcdd2637 薪资档案以及社保福利档案页面添加四个tab的列表查询 2022-10-17 10:03:01 +08:00