Commit Graph
100 Commits
Author SHA1 Message Date
ljmwkx 51c2f63080 feat(core): 新增按人打卡数据保存逻辑 2025-07-21 21:26:03 +08:00
ljmwkx cb086db5a6 增加 假期打卡记录的记录 待测试 2025-04-09 21:39:23 +08:00
ljmwkx cb99780ac2 Merge remote-tracking branch 'origin/dev' into dev 2025-04-09 21:30:15 +08:00
ljmwkx fe1f43345e 增加 假期打卡记录的记录 待测试 2025-04-09 21:29:12 +08:00
ljmwkx 736d3499ff 增加 假期打卡记录的记录 待测试 2025-03-31 22:07:48 +08:00
ljmwkx 65c136c97b 增加 假期打卡记录的记录 待测试 2025-03-31 22:05:26 +08:00
ljm 0da84025df !1938 !1937 1
Merge pull request !1938 from ljm/dev
2025-03-19 14:16:42 +00:00
ljm e68aa67a14 !1937 1
Merge pull request !1937 from ljm/dev_ljm_20241129
2025-03-19 14:16:19 +00:00
ljmwkx 39508ab00f 1 2025-03-19 22:15:08 +08:00
ljm 39dd465fa0 !1936 !1935 1
Merge pull request !1936 from ljm/dev
2025-03-19 14:11:11 +00:00
ljm 5d4654b7d7 !1935 1
Merge pull request !1935 from ljm/dev_ljm_20241129
2025-03-19 14:10:37 +00:00
ljmwkx 6b00421e9f 1 2025-03-19 22:09:39 +08:00
ljm d24fb19695 !1934 !1933 1
Merge pull request !1934 from ljm/dev
2025-03-19 13:45:08 +00:00
ljm b954882a18 !1933 1
Merge pull request !1933 from ljm/dev_ljm_20241129
2025-03-19 13:44:46 +00:00
ljmwkx bedf849485 1 2025-03-19 21:44:00 +08:00
ljm 277a1a94f7 !1932 !1931 1
Merge pull request !1932 from ljm/dev
2025-03-19 13:37:54 +00:00
ljm f5f6189e82 !1931 1
Merge pull request !1931 from ljm/dev_ljm_20241129
2025-03-19 13:37:20 +00:00
ljmwkx bd98d8eb50 1 2025-03-19 21:36:19 +08:00
ljm dfb681572c !1907 1
Merge pull request !1907 from ljm/dev_ljm_20241129
2025-03-18 13:34:37 +00:00
ljm ef9fb6aa1b !1906 1
Merge pull request !1906 from ljm/dev_ljm_20241129
2025-03-18 13:33:25 +00:00
ljmwkx 6c38fa1a58 1 2025-03-18 21:32:31 +08:00
ljmwkx 378eb23fef 1 2025-03-18 21:30:56 +08:00
ljmwkx 7cf17b5dca Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_ljm_20241129 2025-03-18 21:13:28 +08:00
ljmwkx c526243cf0 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_ljm_20241129 2025-03-18 20:52:46 +08:00
ljmwkx e299e1118d 1 2025-03-13 18:00:17 +08:00
ljm 513bd278d4 !1767 1
Merge pull request !1767 from dev_ljm_20241129
2025-03-12 05:24:11 +00:00
ljmwkx 1aff5e42ee 1 2025-03-12 13:23:17 +08:00
ljm cb96590d83 !1766 1
Merge pull request !1766 from dev_ljm_20241129
2025-03-12 05:21:08 +00:00
ljmwkx 2939f69a91 1 2025-03-12 13:20:04 +08:00
ljm 11b3f5f4cf !1761 1
Merge pull request !1761 from dev_ljm_20241129
2025-03-12 02:24:07 +00:00
ljmwkx d5a7474ad5 1 2025-03-12 10:21:36 +08:00
ljm 1d092ee31c !1737 1
Merge pull request !1737 from ljm/dev_ljm_20241129
2025-03-10 11:32:47 +00:00
ljmwkx b24184c197 1 2025-03-10 19:29:29 +08:00
ljm 3d07fa855d !1728 1
Merge pull request !1728 from ljm/dev_ljm_20241129
2025-03-10 02:43:08 +00:00
ljmwkx 1aa7c2a1bb 1 2025-03-10 10:41:53 +08:00
ljm a8692ce568 !1714 1
Merge pull request !1714 from ljm/dev_ljm_20241129
2025-03-08 13:11:51 +00:00
ljmwkx 9a86c17395 1 2025-03-08 21:10:35 +08:00
ljm 76d0b9c43b !1713 1
Merge pull request !1713 from ljm/dev_ljm_20241129
2025-03-08 12:41:07 +00:00
ljmwkx 51e1dec167 1 2025-03-08 20:40:06 +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
ljm f9155d9fbe !1679 1
Merge pull request !1679 from ljm/dev_ljm_20241129
2025-03-04 01:21:35 +00:00
ljmwkx 75c20d9886 1 2025-03-04 09:19:08 +08:00
ljm 7878297e54 !1678 1
Merge pull request !1678 from ljm/dev_ljm_20241129
2025-03-03 14:17:07 +00:00
ljmwkx 624880a1f5 1 2025-03-03 22:14:00 +08:00
ljm 4589fac739 !1675 1
Merge pull request !1675 from ljm/dev_ljm_20241129
2025-03-03 10:24:51 +00:00
ljmwkx 3298ff6102 1 2025-03-03 18:23:10 +08:00
ljm 7d72d192d5 !1674 1
Merge pull request !1674 from ljm/dev_ljm_20241129
2025-03-03 09:54:14 +00:00
ljmwkx 2606ee0541 1 2025-03-03 17:53:10 +08:00
ljmwkx 01269179ca 1 2025-03-03 17:52:24 +08:00
ljmwkx 67da938400 1 2025-03-03 17:50:48 +08:00
ljm c33e38d3bc !1672 1
Merge pull request !1672 from ljm/dev_ljm_20241129
2025-03-03 09:27:17 +00:00
ljmwkx ab9f2b45b4 1 2025-03-03 17:14:20 +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
ljmwkx f47824f9e1 1 2025-03-02 09:21:40 +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
ljmwkx 373a32f0d2 启用隐藏 2025-03-01 20:41:06 +08:00
ljmwkx 809140109b 启用隐藏 2025-03-01 20:36:10 +08:00
ljm cdfb6fb051 !1629 1
Merge pull request !1629 from ljm/dev_ljm_20241129
2025-03-01 09:11:57 +00:00
ljmwkx 471a3b317c 1 2025-03-01 17:01:29 +08:00
ljm 8507c56b20 !1628 1
Merge pull request !1628 from ljm/dev_ljm_20241129
2025-03-01 08:52:10 +00:00
ljmwkx b00af69b9d 1 2025-03-01 16:49:03 +08:00
ljm 93070e1358 !1623 1
Merge pull request !1623 from ljm/dev_ljm_20241129
2025-03-01 07:34:56 +00:00
ljmwkx 185b6ffd70 1 2025-03-01 15:32:49 +08:00
ljm 02b5548533 !1622 1
Merge pull request !1622 from ljm/dev_ljm_20241129
2025-03-01 07:12:26 +00:00
ljmwkx ce66e1f8c5 1 2025-03-01 15:10:31 +08:00
ljmwkx 5e42366cb6 1 保存取消按钮 2025-02-28 18:06:42 +08:00
ljm be2976ca58 !1618 1 白名单
Merge pull request !1618 from ljm/dev_ljm_20241129
2025-02-28 09:10:52 +00:00
ljmwkx 9348306678 1 白名单 2025-02-28 17:09:44 +08:00
ljm 7fd0b4d31d !1615 1
Merge pull request !1615 from ljm/dev_ljm_20241129
2025-02-28 07:10:21 +00:00
ljmwkx b938debe1f 1 2025-02-28 15:08:14 +08:00
ljm ea924d940b !1614 1
Merge pull request !1614 from ljm/dev_ljm_20241129
2025-02-28 06:45:31 +00:00
ljmwkx 4317e3a83b 1 2025-02-28 14:42:42 +08:00
ljmwkx 7aaef85f80 1 2025-02-28 13:57:28 +08:00
ljm 13f2b77ae8 !1613 1
Merge pull request !1613 from ljm/dev_ljm_20241129
2025-02-28 03:39:18 +00:00
ljmwkx 900c705483 1 2025-02-28 11:33:47 +08:00
ljm a0861d5f69 !1583 1
Merge pull request !1583 from dev_ljm_20241129
2025-02-25 14:29:32 +00:00
ljmwkx 9a5b85043d 1 2025-02-25 22:28:30 +08:00
ljm 017c1f060f !1582 !1581 1
Merge pull request !1582 from dev
2025-02-25 14:16:26 +00:00
ljm 70ce364c80 !1581 1
Merge pull request !1581 from dev_ljm_20241129
2025-02-25 14:16:02 +00:00
ljmwkx c7ddbbda09 1 2025-02-25 22:15:17 +08:00
ljm 87247c12a6 !1580 1
Merge pull request !1580 from dev_ljm_20241129
2025-02-25 13:55:56 +00:00
ljmwkx 89c81caeaf 1 2025-02-25 21:54:13 +08:00
ljm dd9d5cecf0 !1575 1
Merge pull request !1575 from dev_ljm_20241129
2025-02-25 06:01:31 +00:00
ljmwkx 8a59fae1f4 1 2025-02-25 14:00:37 +08:00
ljm 5eb0f833aa !1574 1
Merge pull request !1574 from dev_ljm_20241129
2025-02-25 05:53:16 +00:00
ljmwkx f57691eb2b 1 2025-02-25 12:51:34 +08:00
ljm 27f581ba04 !1573 !1572 1
Merge pull request !1573 from dev
2025-02-25 03:12:14 +00:00
ljm 551c4fa29a !1572 1
Merge pull request !1572 from dev_ljm_20241129
2025-02-25 03:11:09 +00:00
ljmwkx 167bcb26a9 1 2025-02-25 11:08:21 +08:00
ljm d7e04bac08 !1565 1
Merge pull request !1565 from dev_ljm_20241129
2025-02-25 00:59:35 +00:00
ljmwkx bd15be1b18 1 2025-02-25 08:53:58 +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
ljm edf23a79bb !1504 翻译 文件
Merge pull request !1504 from ljm/dev_ljm_20241129
2025-02-18 10:00:30 +00:00
ljm 77022bf23d !1503 样式 调整
Merge pull request !1503 from ljm/dev_ljm_20241129
2025-02-18 09:59:07 +00:00