 李鹏宇
|
0d1393300f
|
!751 zhou
Merge pull request !751 from 李鹏宇/dev
|
2024-12-13 08:35:36 +00: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 |
|
|
李鹏宇
|
4b8ac3b186
|
!749 zhou
Merge pull request !749 from 李鹏宇/dev
|
2024-12-13 08:28:31 +00: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 |
|
|
李鹏宇
|
e4646bd8ee
|
!747 pengyuthon
Merge pull request !747 from 李鹏宇/dev
|
2024-12-13 02:33:27 +00:00 |
|
|
李鹏宇
|
69fab5f258
|
pengyuthon wechat
|
2024-12-13 10:21:35 +08:00 |
|
|
李鹏宇
|
83dd879075
|
!746 pengyuthon
Merge pull request !746 from 李鹏宇/dev
|
2024-12-12 15:36:13 +00: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 |
|
|
李鹏宇
|
bec23a5d09
|
!744 zhou
Merge pull request !744 from 李鹏宇/dev
|
2024-12-12 12:43:22 +00: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 |
|
|
李鹏宇
|
faf364d22e
|
!740 zhou
Merge pull request !740 from 李鹏宇/dev
|
2024-12-12 07:23:30 +00: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 |
|
|
李鹏宇
|
3bdc346224
|
!738 zhou
Merge pull request !738 from 李鹏宇/dev
|
2024-12-12 07:16:40 +00: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 |
|
|
李鹏宇
|
9068c1ca07
|
!736 zhou
Merge pull request !736 from 李鹏宇/dev
|
2024-12-12 06:57:00 +00: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 |
|
|
李鹏宇
|
d542e116da
|
!732 soong
Merge pull request !732 from 李鹏宇/dev
|
2024-12-11 23:55:41 +00:00 |
|
|
李鹏宇
|
66789f839a
|
pengyuthon wechat
|
2024-12-12 07:54:16 +08:00 |
|
|
李鹏宇
|
674290b6b2
|
!731 天河投资
Merge pull request !731 from 李鹏宇/dev
|
2024-12-11 17:24:10 +00:00 |
|
|
李鹏宇
|
0c8ece6661
|
pengyuthon wechat
|
2024-12-12 01:20:16 +08:00 |
|
|
李鹏宇
|
24e2737b4a
|
!730 pengyuthon
Merge pull request !730 from 李鹏宇/dev
|
2024-12-11 14:13:41 +00:00 |
|
|
ljm
|
30793e1f89
|
!729 1
Merge pull request !729 from dev_ljm_20241129
|
2024-12-11 14:00:03 +00:00 |
|
|
ljmwkx
|
c93e6b3625
|
审批 还原
|
2024-12-11 21:58:53 +08:00 |
|
|
李鹏宇
|
d05de9f20d
|
!728 zhou
Merge pull request !728 from 李鹏宇/dev
|
2024-12-11 12:05:33 +00:00 |
|
|
李鹏宇
|
34c29f9614
|
!727 zhou
Merge pull request !727 from 李鹏宇/dev_zhou
|
2024-12-11 12:05:08 +00:00 |
|
|
zhouzhou
|
850fd6fa59
|
添加功能
|
2024-12-11 20:03:44 +08:00 |
|
|
李鹏宇
|
1aee66ad5f
|
pengyuthon wechat
|
2024-12-11 19:58:22 +08:00 |
|
|
李鹏宇
|
71595c1b81
|
!726 zhou
Merge pull request !726 from 李鹏宇/dev
|
2024-12-11 11:56:13 +00:00 |
|
|
李鹏宇
|
b361e4172b
|
!725 zhou
Merge pull request !725 from 李鹏宇/dev_zhou
|
2024-12-11 11:55:52 +00:00 |
|
|
zhouzhou
|
76f72733de
|
添加功能
|
2024-12-11 19:50:24 +08:00 |
|