 李鹏宇
|
d88d795ffb
|
!8303 添加功能
Merge pull request !8303 from 李鹏宇/dev_zhou
|
2026-01-26 04:03:46 +00:00 |
|
|
李鹏宇
|
9865d99d1a
|
添加功能
|
2026-01-26 12:03:10 +08:00 |
|
|
李鹏宇
|
bdbf74dc8c
|
!8301 Merge branch 'refs/heads/master' into dev_zhou
Merge pull request !8301 from 李鹏宇/dev_zhou
|
2026-01-26 02:46:29 +00:00 |
|
|
李鹏宇
|
592970869d
|
Merge branch 'refs/heads/master' into dev_zhou
# Conflicts:
# yuthon_hr_attendance/views/yuthon_vacation_reports_views.xml
# yuthon_salary/views/yuthon_salary_active_views.xml
|
2026-01-26 10:45:56 +08:00 |
|
|
李鹏宇
|
ab9aec8e63
|
添加功能
|
2026-01-26 10:40:08 +08:00 |
|
|
李鹏宇
|
94d8f41b10
|
!8300 出勤接口
Merge pull request !8300 from 李鹏宇/dev
|
2026-01-25 15:07:14 +00:00 |
|
|
pengyuthon
|
cf2ac5ac18
|
出勤接口
|
2026-01-25 23:01:01 +08:00 |
|
|
李鹏宇
|
7a2ea2163f
|
!8299 出勤接口
Merge pull request !8299 from 李鹏宇/dev
|
2026-01-25 14:58:36 +00:00 |
|
|
pengyuthon
|
16316f5f07
|
出勤接口
|
2026-01-25 22:58:07 +08:00 |
|
|
李鹏宇
|
7220e7d1da
|
!8298 出勤接口
Merge pull request !8298 from 李鹏宇/dev
|
2026-01-25 14:46:37 +00:00 |
|
|
pengyuthon
|
121eaff009
|
出勤接口
|
2026-01-25 22:46:00 +08:00 |
|
|
李鹏宇
|
64cde9158d
|
!8297 出勤接口
Merge pull request !8297 from 李鹏宇/dev
|
2026-01-25 14:31:31 +00:00 |
|
|
pengyuthon
|
f6d159896a
|
出勤接口
|
2026-01-25 22:31:08 +08:00 |
|
|
李鹏宇
|
a06e06543d
|
!8296 出勤接口
Merge pull request !8296 from 李鹏宇/dev
|
2026-01-25 14:02:54 +00:00 |
|
|
pengyuthon
|
f3579f97cd
|
出勤接口
|
2026-01-25 22:02:28 +08:00 |
|
|
李鹏宇
|
0985a467c4
|
!8295 出勤接口
Merge pull request !8295 from 李鹏宇/dev
|
2026-01-25 13:38:37 +00:00 |
|
|
pengyuthon
|
407a087277
|
Merge branch 'master' into dev
|
2026-01-25 21:37:35 +08:00 |
|
|
pengyuthon
|
85b54286ca
|
出勤接口
|
2026-01-25 21:37:07 +08:00 |
|
|
李鹏宇
|
077ae756d2
|
!8294 考勤跳转
Merge pull request !8294 from 李鹏宇/dev
|
2026-01-25 10:43:00 +00:00 |
|
|
pengyuthon
|
914c882d84
|
考勤跳转
|
2026-01-25 18:42:00 +08:00 |
|
|
李鹏宇
|
eac92a7a18
|
!8293 手机小红点
Merge pull request !8293 from 李鹏宇/dev
|
2026-01-25 09:02:48 +00:00 |
|
|
pengyuthon
|
13fa2f119e
|
手机小红点
|
2026-01-25 17:01:52 +08:00 |
|
|
李鹏宇
|
db1aff39ee
|
!8292 出勤字段，和看板样式优化
Merge pull request !8292 from 李鹏宇/dev
|
2026-01-25 08:04:01 +00:00 |
|
|
pengyuthon
|
e2b887a35f
|
出勤字段，和看板样式优化
|
2026-01-25 15:59:59 +08:00 |
|
|
李鹏宇
|
98a7ef733c
|
!8291 Merge remote-tracking branch 'origin/dev' into dev
Merge pull request !8291 from 李鹏宇/dev
|
2026-01-24 14:26:06 +00:00 |
|
|
pengyuthon
|
22db266c13
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-01-24 22:24:00 +08:00 |
|
|
pengyuthon
|
56b9a533c6
|
登录恢复
|
2026-01-24 22:21:12 +08:00 |
|
|
李鹏宇
|
f44cda604a
|
!8290 !8289 添加功能
Merge pull request !8290 from 李鹏宇/dev
|
2026-01-24 14:20:25 +00:00 |
|
|
李鹏宇
|
62e7d2b3f1
|
!8289 添加功能
Merge pull request !8289 from 李鹏宇/dev_zhou
|
2026-01-24 14:19:56 +00:00 |
|
|
李鹏宇
|
02bd9756b9
|
添加功能
|
2026-01-24 22:18:48 +08:00 |
|
|
李鹏宇
|
dc9fd5a707
|
Merge remote-tracking branch 'origin/dev_zhou' into dev_zhou
|
2026-01-24 22:14:19 +08:00 |
|
|
李鹏宇
|
fec0d45882
|
!8288 !8287 添加功能
Merge pull request !8288 from 李鹏宇/dev
|
2026-01-24 14:09:38 +00:00 |
|
|
李鹏宇
|
6157cf4c7d
|
!8287 添加功能
Merge pull request !8287 from 李鹏宇/dev_zhou
|
2026-01-24 14:09:19 +00:00 |
|
|
李鹏宇
|
5bec098337
|
Merge branch 'dev' of gitee.com:jinan-pengyusen-data/gzth into dev_zhou
Signed-off-by: 李鹏宇 <pengyuthon@163.com>
|
2026-01-24 14:09:06 +00:00 |
|
|
李鹏宇
|
d247ac94d8
|
Merge branch 'master' into dev_zhou
|
2026-01-24 22:08:01 +08:00 |
|
|
李鹏宇
|
82c5fa773d
|
添加功能
|
2026-01-24 22:07:03 +08:00 |
|
|
pengyuthon
|
b92bef97eb
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-01-24 20:09:52 +08:00 |
|
|
pengyuthon
|
0821ef3364
|
样式调整
|
2026-01-24 20:09:39 +08:00 |
|
|
李鹏宇
|
0eb500fd5e
|
避免空值报错
|
2026-01-24 19:51:55 +08:00 |
|
|
李鹏宇
|
d0d276d26e
|
多了个1
|
2026-01-24 19:36:03 +08:00 |
|
|
李鹏宇
|
9e70ab70da
|
工资条menuitem id
|
2026-01-24 19:06:22 +08:00 |
|
|
李鹏宇
|
0c64d53e2b
|
薪资接口
|
2026-01-24 19:00:26 +08:00 |
|
|
李鹏宇
|
6355319cfd
|
Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev
|
2026-01-24 17:42:05 +08:00 |
|
|
pengyuthon
|
86610abfe6
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-01-24 17:26:08 +08:00 |
|
|
李鹏宇
|
9dc5558178
|
!8286 !8285 添加功能
Merge pull request !8286 from dev
|
2026-01-24 09:25:17 +00:00 |
|
|
李鹏宇
|
8392d82bce
|
!8285 添加功能
Merge pull request !8285 from 李鹏宇/dev_zhou
|
2026-01-24 09:24:56 +00:00 |
|
|
李鹏宇
|
f6bcbd0086
|
添加功能
|
2026-01-24 17:24:03 +08:00 |
|
|
pengyuthon
|
170689bb2b
|
Merge remote-tracking branch 'origin/dev' into dev
|
2026-01-24 17:22:35 +08:00 |
|
|
李鹏宇
|
0499c6467f
|
添加功能
|
2026-01-24 17:21:45 +08:00 |
|
|
李鹏宇
|
e482d2be3d
|
Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev
|
2026-01-24 17:07:29 +08:00 |
|