Commit Graph
1736 Commits
Author SHA1 Message Date
李鹏宇 cb7a923ee7 !765 zhou
Merge pull request !765 from 李鹏宇/dev_zhou
2024-12-14 11:07:56 +00:00
zhouzhou e76ef5b7f0 添加功能 2024-12-14 19:07:06 +08:00
李鹏宇 9869f77403 !763 zhou
Merge pull request !763 from dev_zhou
2024-12-14 11:00:29 +00:00
zhouzhou 5da5c87ea6 添加功能 2024-12-14 18:58:31 +08:00
李鹏宇 bff65c44a4 !761 zhou
Merge pull request !761 from 李鹏宇/dev_zhou
2024-12-14 09:02:47 +00:00
zhouzhou 637fc11718 添加功能 2024-12-14 17:00:44 +08:00
李鹏宇 e0c0825384 !760 zhou
Merge pull request !760 from 李鹏宇/dev_zhou
2024-12-14 08:27:39 +00:00
zhouzhou 77a38900ba 添加功能 2024-12-14 16:26:55 +08:00
李鹏宇 be97654f54 !759 zhou
Merge pull request !759 from 李鹏宇/dev_zhou
2024-12-14 08:26:15 +00:00
zhouzhou 2ee818ca42 添加功能 2024-12-14 16:24:20 +08:00
李鹏宇 7ce9a94b91 pengyuthon wechat 2024-12-14 15:22:07 +08:00
李鹏宇 e4c1335a01 pengyuthon wechat 2024-12-14 14:20:35 +08:00
李鹏宇 cac1d1efdb !756 zhou
Merge pull request !756 from 李鹏宇/dev_zhou
2024-12-13 13:35:15 +00:00
zhouzhou e005b90ad1 添加功能 2024-12-13 21:34:19 +08:00
李鹏宇 2de4aeb7bf !754 zhou
Merge pull request !754 from 李鹏宇/dev_zhou
2024-12-13 13:33:31 +00:00
zhouzhou 5c06c1e244 添加功能 2024-12-13 21:32:24 +08:00
李鹏宇 f9f55994bb !752 zhou
Merge pull request !752 from 李鹏宇/dev_zhou
2024-12-13 09:21:31 +00:00
zhouzhou 308c535f5b 添加功能 2024-12-13 17:20:01 +08:00
zhouzhou b2d1a9f5df 添加功能 2024-12-13 17:19:18 +08:00
李鹏宇 643947ae25 !750 zhou
Merge pull request !750 from 李鹏宇/dev_zhou
2024-12-13 08:35:09 +00:00
zhouzhou 912e451ca1 添加功能 2024-12-13 16:34:26 +08:00
李鹏宇 15a8ce0be3 !748 zhou
Merge pull request !748 from 李鹏宇/dev_zhou
2024-12-13 08:28:02 +00:00
zhouzhou 4a6454c0c1 Merge branch 'dev' into dev_zhou
# Conflicts:
#	yuthon_hr_attendance/data/attendance_time_data.xml
2024-12-13 16:27:17 +08:00
zhouzhou 49f9dec42f 添加功能 2024-12-13 16:22:09 +08:00
李鹏宇 69fab5f258 pengyuthon wechat 2024-12-13 10:21:35 +08:00
李鹏宇 7843f698e3 pengyuthon wechat 2024-12-12 23:34:34 +08:00
李鹏宇 6b5a203ad3 !745 zhou
Merge pull request !745 from 李鹏宇/dev_zhou
2024-12-12 12:58:40 +00:00
zhouzhou e929320c75 添加功能 2024-12-12 20:57:43 +08:00
李鹏宇 9e995b9d42 !743 zhou
Merge pull request !743 from 李鹏宇/dev_zhou
2024-12-12 12:42:58 +00:00
zhouzhou 38c8241f54 添加功能 2024-12-12 20:41:33 +08:00
李鹏宇 79447bc34e pengyuthon wechat 2024-12-12 20:30:46 +08:00
李鹏宇 cd4b192523 !742 zhou
Merge pull request !742 from 李鹏宇/dev_zhou
2024-12-12 11:17:07 +00:00
zhouzhou d23f07a07d 添加功能 2024-12-12 19:15:25 +08:00
李鹏宇 efefe402b7 !741 zhou
Merge pull request !741 from 李鹏宇/dev_zhou
2024-12-12 10:32:36 +00:00
zhouzhou 7ddf3e228f 添加功能 2024-12-12 18:31:21 +08:00
zhouzhou 47f8b60c6a 添加功能 2024-12-12 15:31:40 +08:00
李鹏宇 c707783bb3 !739 zhou
Merge pull request !739 from 李鹏宇/dev_zhou
2024-12-12 07:23:02 +00:00
zhouzhou 4d5fbba964 添加功能 2024-12-12 15:22:02 +08:00
李鹏宇 b5d8b33f55 !737 zhou
Merge pull request !737 from 李鹏宇/dev_zhou
2024-12-12 07:14:51 +00:00
zhouzhou 9c833d1637 添加功能 2024-12-12 15:11:38 +08:00
李鹏宇 08078cae49 !735 zhou
Merge pull request !735 from 李鹏宇/dev_zhou
2024-12-12 06:56:14 +00:00
zhouzhou a980319089 添加功能 2024-12-12 14:55:30 +08:00
李鹏宇 ae4a26e447 !734 zhou
Merge pull request !734 from 李鹏宇/dev_zhou
2024-12-12 06:28:45 +00:00
zhouzhou 21dd72fd62 Merge branch 'refs/heads/dev' into dev_zhou
# Conflicts:
#	yuthon_hr_attendance/views/go_approval.xml
2024-12-12 14:27:28 +08:00
zhouzhou 9f0d63876a 添加功能 2024-12-12 14:24:04 +08:00
李鹏宇 4d1a03b614 !733 zhou
Merge pull request !733 from 李鹏宇/dev_zhou
2024-12-12 01:46:20 +00:00
zhouzhou 1e6d6e24ce 添加功能 2024-12-12 09:44:49 +08:00
李鹏宇 66789f839a pengyuthon wechat 2024-12-12 07:54:16 +08:00
李鹏宇 0c8ece6661 pengyuthon wechat 2024-12-12 01:20:16 +08:00
ljm 30793e1f89 !729 1
Merge pull request !729 from dev_ljm_20241129
2024-12-11 14:00:03 +00:00