Commit Graph
274 Commits
Author SHA1 Message Date
李鹏宇 3e16152d58 !1695 添加功能
Merge pull request !1695 from 李鹏宇/dev_zhou
2025-03-06 03:38:28 +00:00
zhou 1d271d5cff 添加功能 2025-03-06 11:37:45 +08:00
李鹏宇 bcd905887f 1 2025-03-06 11:28:09 +08:00
李鹏宇 72d33986cd 1 2025-03-05 22:15:42 +08:00
李鹏宇 ba6443f036 1 2025-03-05 16:21:31 +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
李鹏宇 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
ljmwkx ab9f2b45b4 1 2025-03-03 17:14:20 +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
李鹏宇 7a388c2ebd 1 2025-03-03 10:48:56 +08:00
李鹏宇 8f3026e89a 1 2025-03-03 10:13:50 +08:00
李鹏宇 f322ee0d2c 1 2025-03-02 17:26:43 +08:00
李鹏宇 2494d67c9f 1 2025-03-02 15:47:02 +08:00
zhou 3f4d9db4f4 添加功能 2025-03-02 13:36:18 +08:00
ljm 11710cea19 !1642 1
Merge pull request !1642 from ljm/dev_ljm_20241129
2025-03-02 02:29:41 +00:00
ljmwkx c4724b8ccc 1 2025-03-02 10:25:23 +08:00
李鹏宇 8609b7c34a 1 2025-03-01 22:55:54 +08:00
李鹏宇 a64e8c076f 1 2025-03-01 21:34:38 +08:00
李鹏宇 c3b9b97e55 1 2025-03-01 21:12:08 +08:00
ljm 06aa23f9de !1638 启用隐藏
Merge pull request !1638 from ljm/dev_ljm_20241129
2025-03-01 12:44:14 +00:00
ljmwkx b148d33ab0 启用隐藏 2025-03-01 20:42:56 +08:00
李鹏宇 27295f73e0 1 2025-03-01 20:42:45 +08:00
ljmwkx 373a32f0d2 启用隐藏 2025-03-01 20:41:06 +08:00
李鹏宇 7dae4be26a 1 2025-03-01 20:39:01 +08:00
李鹏宇 f36dfea0d0 1 2025-03-01 20:38:04 +08:00
ljmwkx 809140109b 启用隐藏 2025-03-01 20:36:10 +08:00
李鹏宇 d3abd7f59c 1 2025-03-01 20:34:47 +08:00
李鹏宇 2fd3b01da5 1 2025-03-01 20:30:06 +08:00
李鹏宇 9022abc355 1 2025-03-01 18:56:37 +08:00
zhou 03a07bd982 添加功能 2025-03-01 18:07:17 +08:00
zhou 50599a664d Merge branch 'refs/heads/dev' into dev_zhou 2025-03-01 15:48:43 +08:00
zhou c5c729e549 添加功能 2025-02-28 20:45:52 +08:00
zhou 4ebf297194 添加功能 2025-02-28 15:56:26 +08:00
ljmwkx b938debe1f 1 2025-02-28 15:08:14 +08:00
ljmwkx 4317e3a83b 1 2025-02-28 14:42:42 +08:00
ljmwkx 7aaef85f80 1 2025-02-28 13:57:28 +08:00
李鹏宇 f5951f9cc0 1 2025-02-27 23:24:34 +08:00
李鹏宇 15a395a746 1 2025-02-26 16:48:51 +08:00
李鹏宇 2eb02b33c1 1 2025-02-26 15:46:28 +08:00
李鹏宇 09bffff429 1 2025-02-26 15:43:02 +08:00
李鹏宇 f29b1fde38 1 2025-02-26 15:34:19 +08:00
ljmwkx 89c81caeaf 1 2025-02-25 21:54:13 +08:00
ljm c37abf6caf !1564 1
Merge pull request !1564 from dev_ljm_20241129
2025-02-25 00:30:37 +00:00
ljmwkx 79d3bd13eb 1 2025-02-25 08:29:35 +08:00
李鹏宇 b6a52ca546 1 2025-02-24 17:24:14 +08:00
李鹏宇 2fcd04c216 1 2025-02-24 10:53:39 +08:00