Commit Graph
14864 Commits
Author SHA1 Message Date
sunjie 8e8f60b8ee 1. 报表分组
2. 菜单小红点: 菜单上有函数值, 则判断模型是否有该方法,然后执行菜单上的模型方法. 作用: 多菜单情况, 区分.
2026-01-27 17:38:26 +08:00
pengyuthon 120492b203 Merge remote-tracking branch 'origin/dev' into dev 2026-01-27 15:52:35 +08:00
pengyuthon 84b996ae6d 员工管理 2026-01-27 15:52:13 +08:00
pengyuthon 15192af5a0 薪资接口 2026-01-27 15:51:43 +08:00
李鹏宇 cb32e7eb97 !8362 添加功能
Merge pull request !8362 from 李鹏宇/dev_zhou
2026-01-27 06:56:40 +00:00
李鹏宇 974dc33af3 添加功能 2026-01-27 14:55:51 +08:00
李鹏宇 4d9a2669ec 添加功能 2026-01-27 14:53:45 +08:00
李鹏宇 d1b3394730 !8361 薪资接口
Merge pull request !8361 from 李鹏宇/dev
2026-01-27 04:46:13 +00:00
pengyuthon c09400493d Merge branch 'master' into dev 2026-01-27 12:45:54 +08:00
pengyuthon 7c4d742aa4 薪资接口 2026-01-27 12:45:06 +08:00
李鹏宇 7627aaf496 !8360 !8359 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen…
Merge pull request !8360 from 李鹏宇/dev
2026-01-27 03:48:56 +00:00
李鹏宇 f3f558f38f !8359 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen-data/gzth">https://gitee.com/jinan-pengyusen-data/gzth</a> into dev_wang
Merge pull request !8359 from 李鹏宇/dev_wang
2026-01-27 03:48:17 +00:00
李鹏宇 5232bfba56 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-01-27 11:45:15 +08:00
李鹏宇 e981984634 报表修改 2026-01-27 11:44:42 +08:00
李鹏宇 12fc832bee !8358 薪资接口
Merge pull request !8358 from 李鹏宇/dev
2026-01-27 02:59:58 +00:00
pengyuthon 9394c5fb79 薪资接口 2026-01-27 10:59:07 +08:00
李鹏宇 0a630aba7c !8357 Merge remote-tracking branch 'origin/dev' into dev
Merge pull request !8357 from 李鹏宇/dev
2026-01-27 02:16:58 +00:00
pengyuthon d59776eb50 Merge remote-tracking branch 'origin/dev' into dev 2026-01-27 10:16:16 +08:00
pengyuthon 7883202e40 薪资接口 2026-01-27 10:15:59 +08:00
李鹏宇 91335093a3 !8356 !8355 添加功能
Merge pull request !8356 from 李鹏宇/dev
2026-01-27 02:15:56 +00:00
李鹏宇 bcc6d94b6b !8355 添加功能
Merge pull request !8355 from 李鹏宇/dev_zhou
2026-01-27 02:15:33 +00:00
李鹏宇 4c1a0c1913 添加功能 2026-01-27 10:15:03 +08:00
李鹏宇 cde65a27d9 !8354 !8353 添加功能
Merge pull request !8354 from 李鹏宇/dev
2026-01-27 02:04:40 +00:00
李鹏宇 ddd82c1c1c !8353 添加功能
Merge pull request !8353 from 李鹏宇/dev_zhou
2026-01-27 02:04:20 +00:00
李鹏宇 7ef0b0a3bb 添加功能 2026-01-27 10:03:19 +08:00
李鹏宇 cb17eab958 !8352 !8351 添加功能
Merge pull request !8352 from 李鹏宇/dev
2026-01-27 02:00:21 +00:00
李鹏宇 d8751d6ddc !8351 添加功能
Merge pull request !8351 from 李鹏宇/dev_zhou
2026-01-27 01:59:52 +00:00
李鹏宇 f3ffce3ae2 添加功能 2026-01-27 09:53:01 +08:00
李鹏宇 3f10993a87 !8350 薪资接口
Merge pull request !8350 from 李鹏宇/dev
2026-01-26 14:40:47 +00:00
pengyuthon 9c17a65f5b 薪资接口 2026-01-26 22:40:16 +08:00
李鹏宇 cf58475d0d !8349 薪资接口
Merge pull request !8349 from 李鹏宇/dev
2026-01-26 14:39:09 +00:00
pengyuthon 6316118698 薪资接口 2026-01-26 22:38:33 +08:00
李鹏宇 de4d01c223 !8348 Merge remote-tracking branch 'origin/dev' into dev
Merge pull request !8348 from 李鹏宇/dev
2026-01-26 14:36:45 +00:00
pengyuthon 1682eb2a1f Merge remote-tracking branch 'origin/dev' into dev 2026-01-26 22:35:35 +08:00
pengyuthon 4d38a8f59a 薪资接口 2026-01-26 22:34:30 +08:00
李鹏宇 091eb78b16 !8347 !8346 添加功能
Merge pull request !8347 from 李鹏宇/dev
2026-01-26 14:09:24 +00:00
李鹏宇 e766cfb378 !8346 添加功能
Merge pull request !8346 from 李鹏宇/dev_zhou
2026-01-26 14:08:58 +00:00
李鹏宇 e2734e0d97 添加功能 2026-01-26 22:08:32 +08:00
李鹏宇 de8c8abd81 !8345 薪资接口
Merge pull request !8345 from 李鹏宇/dev
2026-01-26 13:49:48 +00:00
pengyuthon c7ec31dc64 Merge branch 'master' into dev 2026-01-26 21:46:59 +08:00
pengyuthon dc9ca6ae07 薪资接口 2026-01-26 21:46:12 +08:00
李鹏宇 4f667c31ba !8344 !8343 报表取消注释
Merge pull request !8344 from 李鹏宇/dev
2026-01-26 13:02:57 +00:00
李鹏宇 ed5dd8d3e3 !8343 报表取消注释
Merge pull request !8343 from 李鹏宇/dev_wang
2026-01-26 13:02:26 +00:00
李鹏宇 859b1b5b32 报表取消注释 2026-01-26 21:01:41 +08:00
李鹏宇 316101d0fb !8342 !8341 手机抽奖接口
Merge pull request !8342 from 李鹏宇/dev
2026-01-26 12:45:40 +00:00
李鹏宇 f24129517a !8341 手机抽奖接口
Merge pull request !8341 from 李鹏宇/dev_wang
2026-01-26 12:44:37 +00:00
李鹏宇 49f9e42c30 手机抽奖接口 2026-01-26 20:41:58 +08:00
李鹏宇 7ca4229c0f !8340 Merge remote-tracking branch 'origin/dev' into dev
Merge pull request !8340 from 李鹏宇/dev
2026-01-26 12:41:39 +00:00
pengyuthon 5be796de41 Merge remote-tracking branch 'origin/dev' into dev 2026-01-26 20:39:33 +08:00
pengyuthon c8d7dcba6e 薪资接口 2026-01-26 20:38:56 +08:00