Commit Graph
3393 Commits
Author SHA1 Message Date
zhou 39b0dbe524 添加功能 2025-03-07 10:34:51 +08:00
zhou 3fc328e6b5 添加功能 2025-03-06 21:32:52 +08:00
zhou 8cb7c307a7 添加功能 2025-03-06 15:46:10 +08:00
zhou abd8a5c6e7 添加功能 2025-03-06 11:37:59 +08:00
zhou 1d271d5cff 添加功能 2025-03-06 11:37:45 +08:00
zhou 353487ff3b 添加功能 2025-03-05 17:39:21 +08:00
zhou 13e2c4df6e 添加功能 2025-03-05 16:45:44 +08:00
李鹏宇 ba6443f036 1 2025-03-05 16:21:31 +08:00
李鹏宇 eee7a090ba !1689 添加功能
Merge pull request !1689 from 李鹏宇/dev_zhou
2025-03-05 03:42:12 +00:00
zhou 14c26e00fe 添加功能 2025-03-05 11:41:40 +08:00
李鹏宇 c335327aa5 !1687 添加功能
Merge pull request !1687 from dev_zhou
2025-03-05 03:31:27 +00:00
zhou 0e885e613e 添加功能 2025-03-05 11:25:50 +08:00
zhou abc2943e73 添加功能 2025-03-05 11:21:32 +08:00
李鹏宇 34fff23c81 !1685 添加功能
Merge pull request !1685 from 李鹏宇/dev_zhou
2025-03-04 14:17:56 +00:00
zhou 248e1d7372 添加功能 2025-03-04 22:15:58 +08:00
李鹏宇 42467f19d1 !1683 Merge branch 'refs/heads/dev' into dev_zhou
Merge pull request !1683 from 李鹏宇/dev_zhou
2025-03-04 12:52:46 +00:00
zhou 6298414a7c Merge branch 'refs/heads/dev' into dev_zhou 2025-03-04 20:51:30 +08:00
zhou adc3ab1c1f 添加功能 2025-03-04 20:50:17 +08:00
ljm 33082d3f11 !1681 1
Merge pull request !1681 from ljm/dev_ljm_20241129
2025-03-04 06:25:43 +00:00
ljmwkx 700b829761 1 2025-03-04 14:24:05 +08:00
ljm b005ef6698 !1680 1
Merge pull request !1680 from ljm/dev_ljm_20241129
2025-03-04 06:05:36 +00:00
ljmwkx 4a165f3311 1 2025-03-04 14:04:13 +08:00
ljm f9155d9fbe !1679 1
Merge pull request !1679 from ljm/dev_ljm_20241129
2025-03-04 01:21:35 +00:00
ljmwkx 75c20d9886 1 2025-03-04 09:19:08 +08:00
ljm 7878297e54 !1678 1
Merge pull request !1678 from ljm/dev_ljm_20241129
2025-03-03 14:17:07 +00:00
ljmwkx 624880a1f5 1 2025-03-03 22:14:00 +08:00
李鹏宇 48dc307683 !1676 添加功能
Merge pull request !1676 from 李鹏宇/dev_zhou
2025-03-03 10:48:07 +00:00
李鹏宇 c3052e1a29 Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev_zhou
Signed-off-by: 李鹏宇 <9664676+pengyuthon@user.noreply.gitee.com>
2025-03-03 10:47:50 +00:00
zhou 98e96948ec 添加功能 2025-03-03 18:42:20 +08:00
ljm 4589fac739 !1675 1
Merge pull request !1675 from ljm/dev_ljm_20241129
2025-03-03 10:24:51 +00:00
ljmwkx 3298ff6102 1 2025-03-03 18:23:10 +08:00
zhou 595a2b82f5 添加功能 2025-03-03 18:05:30 +08:00
ljm 7d72d192d5 !1674 1
Merge pull request !1674 from ljm/dev_ljm_20241129
2025-03-03 09:54:14 +00:00
ljmwkx 2606ee0541 1 2025-03-03 17:53:10 +08:00
ljmwkx 01269179ca 1 2025-03-03 17:52:24 +08:00
ljmwkx 67da938400 1 2025-03-03 17:50:48 +08:00
ljm c33e38d3bc !1672 1
Merge pull request !1672 from ljm/dev_ljm_20241129
2025-03-03 09:27:17 +00:00
ljmwkx ab9f2b45b4 1 2025-03-03 17:14:20 +08:00
zhou 72b52f89ee 添加功能 2025-03-03 16:27:07 +08:00
李鹏宇 56f7bcaf33 1 2025-03-03 16:22:40 +08:00
zhou 31fe1a2669 添加功能 2025-03-03 16:03:29 +08:00
zhou afd4aff9ad 添加功能 2025-03-03 16:01:43 +08:00
zhou 7577527541 添加功能 2025-03-03 15:22:22 +08:00
zhou 5e671cca12 添加功能 2025-03-03 15:16:27 +08:00
zhou 6b739ce921 Merge branch 'dev' into dev_zhou
# Conflicts:
#	yuthon_holiday/views/hr_leave_batch.xml
2025-03-03 15:15:43 +08:00
zhou c7596c777f 添加功能 2025-03-03 15:13:50 +08:00
zhou de6979f30c 添加功能 2025-03-03 15:12:10 +08:00
李鹏宇 b938230847 !1661 添加功能
Merge pull request !1661 from 李鹏宇/dev_zhou
2025-03-03 03:44:46 +00:00
zhou 3cf4ca18cf 添加功能 2025-03-03 11:44:02 +08:00
李鹏宇 f5d579663b !1660 1
Merge pull request !1660 from 李鹏宇/dev
2025-03-03 02:58:43 +00:00