Commit Graph

1941 Commits

Author SHA1 Message Date
黎永顺 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
黎永顺 84ed52dfde Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.5.2406.03 2024-07-15 11:36:41 +08:00
黎永顺 8df63d4a8c hotfix/2.14.2.2406.02 2024-07-15 11:35:53 +08:00
黎永顺 4d2058b180 hotfix/2.14.2.2406.02 2024-07-11 15:05:00 +08:00
黎永顺 45a1eb6ccf custom/陕西万众-薪资账套薪资核算配置 2024-07-10 14:53:51 +08:00
黎永顺 4f5aa85c73 Merge branch 'release/2.14.5.2406.03' into custom/陕西万众-薪资账套薪资核算配置
# Conflicts:
#	pc4mobx/hrmSalary/apis/calculate.js
#	pc4mobx/hrmSalary/pages/calculate/doCalc/components/salaryEditCalc/index.js
#	pc4mobx/hrmSalary/stores/calculate.js
2024-07-10 14:43:24 +08:00
黎永顺 acd27d2381 Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.5.2406.03 2024-07-02 15:07:28 +08:00
黎永顺 5a2ecefa6f hotfix/2.14.2.2406.02 2024-07-02 15:05:17 +08:00
黎永顺 b7ececb0c4 Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.5.2406.03 2024-06-28 17:00:13 +08:00
黎永顺 230aea8d62 hotfix/2.14.2.2406.02 2024-06-28 16:57:05 +08:00
黎永顺 e8793795ba Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.5.2406.03 2024-06-26 10:08:11 +08:00
黎永顺 3ee2ece60d hotfix/2.14.2.2406.02 2024-06-26 10:07:45 +08:00
黎永顺 210e788b38 Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.5.2406.03 2024-06-26 10:03:13 +08:00
黎永顺 da6a8266f6 hotfix/2.14.2.2406.02 2024-06-26 10:02:45 +08:00
黎永顺 bf0ce0ecac Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02 2024-06-21 10:44:32 +08:00
黎永顺 a4e072e3ee hotfix/2.14.2.2406.02 2024-06-21 10:05:47 +08:00
黎永顺 d2b8906773 Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02 2024-06-20 17:26:13 +08:00
黎永顺 6bb79ab685 hotfix/2.14.2.2406.02 2024-06-20 17:25:55 +08:00
黎永顺 d229730efe Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02 2024-06-20 17:18:32 +08:00
黎永顺 3ba1544842 hotfix/2.14.2.2406.02 2024-06-20 17:18:12 +08:00
黎永顺 9a9a934fb7 Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02 2024-06-20 14:06:36 +08:00
黎永顺 4d56e8284f hotfix/2.14.2.2406.02 2024-06-20 14:06:16 +08:00
黎永顺 7d47a0b4fd Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02 2024-06-20 11:17:50 +08:00
黎永顺 93c39cad41 hotfix/2.14.2.2406.02 2024-06-20 11:17:30 +08:00
黎永顺 4a5328791d Merge branch 'hotfix/2.14.2.2406.02' into release/2.14.4.2406.02 2024-06-20 10:04:44 +08:00
黎永顺 6f29f9c56a hotfix/2.14.2.2406.02 2024-06-20 09:15:07 +08:00
黎永顺 c39515d7f9 hotfix/2.14.2.2406.02 2024-06-19 11:43:08 +08:00
黎永顺 823788e531 hotfix/2.14.2.2406.02 2024-06-19 11:24:59 +08:00
黎永顺 10c7903892 hotfix/2.14.2.2406.02 2024-06-18 17:48:08 +08:00
黎永顺 e50be3d3f3 Merge branch 'feature/2.14.4.2406.02-工资单发放预览' into release/2.14.4.2406.02 2024-06-18 15:31:19 +08:00
黎永顺 1c67adbd25 feature/2.14.4.2406.02-工资单发放预览 2024-06-18 15:30:46 +08:00
黎永顺 7221d910ca hotfix/2.14.2.240默认值 2024-06-18 10:44:48 +08:00
黎永顺 2e775eb205 feature/2.14.4.2406.02-工资单发放预览 2024-06-18 09:07:43 +08:00
黎永顺 40fe79c0e5 hotfix/2.14.2.2406.02 2024-06-17 17:24:21 +08:00
黎永顺 4ebb3a422e feature/2.14.4.2406.02-工资单发放预览 2024-06-17 17:20:01 +08:00
黎永顺 e0b6dc4585 feature/2.14.4.2406.02-工资单发放预览 2024-06-17 16:47:08 +08:00
黎永顺 add6a70abd hotfix/2.14.2.2406.02 2024-06-17 16:17:16 +08:00
黎永顺 f4cbacd591 hotfix/2.14.2.2406.02 2024-06-14 16:33:26 +08:00
黎永顺 24f9d7e57f hotfix/2.14.2.2406.02 2024-06-13 09:06:22 +08:00
黎永顺 c80a1c73fe hotfix/2.14.2.2406.02 2024-06-12 18:56:02 +08:00
黎永顺 1ddcab4f38 hotfix/2.14.2.2406.02 2024-06-12 17:38:34 +08:00
黎永顺 76db508066 产品优化 - 社保福利台账小数位数优化 2024-06-11 15:27:22 +08:00
黎永顺 15c81c8156 release/2.14.3.2406.01 2024-06-06 17:25:31 +08:00
黎永顺 1a2bf2bc6e 0release/2.14.3.2406.01 2024-06-05 09:10:04 +08:00
黎永顺 6d89db8dfe Merge branch 'feature/2.14.3.2406.01-薪资核算添加锁定人员数据' into release/2.14.3.2406.01 2024-05-30 17:07:50 +08:00