Commit Graph
100 Commits
Author SHA1 Message Date
pengyuthon 2d7ee987e3 1 2025-12-08 09:39:49 +08:00
pengyuthon 29f88f75be Merge remote-tracking branch 'origin/dev' into dev 2025-12-04 00:13:32 +08:00
pengyuthon 85e4274e84 1 2025-12-04 00:12:38 +08:00
pengyuthon 5add9197f0 1 2025-12-02 21:44:08 +08:00
pengyuthon 8a0acf7175 Merge branch 'master' into dev 2025-12-02 21:42:00 +08:00
pengyuthon 4322367a1a Merge remote-tracking branch 'origin/dev' into dev 2025-12-02 21:41:34 +08:00
pengyuthon 8965b4c308 1 2025-11-24 23:53:59 +08:00
pengyuthon 5bb88042dd Merge branch 'master' into dev 2025-11-21 12:14:41 +08:00
pengyuthon 5069023e01 Merge remote-tracking branch 'origin/dev' into dev 2025-11-21 12:13:55 +08:00
pengyuthon 4f3fc1a575 Merge branch 'master' into dev 2025-11-19 15:22:12 +08:00
pengyuthon e21c3d5d42 Merge remote-tracking branch 'origin/dev' into dev 2025-11-08 23:54:17 +08:00
pengyuthon 01afec2708 1 2025-11-08 10:43:15 +08:00
pengyuthon f99b1d7a04 1 2025-11-07 17:06:13 +08:00
pengyuthon a08667f522 1 2025-11-07 17:01:47 +08:00
pengyuthon c0c57fe07b 1 2025-11-07 16:57:36 +08:00
pengyuthon cd7b39a891 1 2025-11-07 16:51:11 +08:00
pengyuthon 78bd978ce3 1 2025-11-07 15:31:41 +08:00
pengyuthon 5a8877d7c1 1 2025-10-27 11:07:53 +08:00
pengyuthon d115074092 1 2025-10-27 00:26:56 +08:00
pengyuthon 189c40a919 1 2025-10-27 00:05:27 +08:00
pengyuthon 31989ca2ec 1 2025-10-26 23:31:11 +08:00
pengyuthon 87423a4492 1 2025-10-26 23:13:46 +08:00
pengyuthon e157bdfd8c 1 2025-10-26 23:11:58 +08:00
pengyuthon 10660a6a5a 1 2025-10-21 09:57:06 +08:00
pengyuthon 934742dcde 1 2025-10-20 09:28:49 +08:00
pengyuthon 7cf5f65a2a 1 2025-10-19 23:57:57 +08:00
pengyuthon 323eb387ef 1 2025-10-19 23:46:09 +08:00
pengyuthon e2f53c280e 1 2025-10-19 00:32:30 +08:00
pengyuthon 9136ae704e 1 2025-10-19 00:24:54 +08:00
pengyuthon b04afe2518 1 2025-10-19 00:20:09 +08:00
pengyuthon 476cb6fd5b 1 2025-10-19 00:19:04 +08:00
pengyuthon 27741fb638 1 2025-10-19 00:13:22 +08:00
pengyuthon bd0e9ac313 1 2025-10-18 22:54:34 +08:00
pengyuthon ef0591bba3 1 2025-10-17 09:23:21 +08:00
pengyuthon 649471dac0 1 2025-10-17 09:08:13 +08:00
pengyuthon 8b9bab06ba 1 2025-10-16 19:00:44 +08:00
pengyuthon be4bc8f3e6 1 2025-10-16 15:09:48 +08:00
pengyuthon 8330fff355 1 2025-10-16 14:57:07 +08:00
pengyuthon 158803f679 1 2025-10-14 19:25:18 +08:00
pengyuthon 95d8656835 1 2025-10-14 19:06:27 +08:00
pengyuthon 00a6d8086d 1 2025-10-14 12:30:43 +08:00
pengyuthon 7b56ba2639 1 2025-10-14 00:09:40 +08:00
pengyuthon 81247eafc1 1 2025-10-13 09:24:35 +08:00
pengyuthon fd91536354 1 2025-10-11 11:22:21 +08:00
pengyuthon 37cadab15d 1 2025-10-10 15:02:37 +08:00
pengyuthon d7bc1bf1af 1 2025-10-10 10:06:59 +08:00
pengyuthon 8404f75f14 1 2025-10-10 09:38:53 +08:00
pengyuthon 507113b321 1 2025-10-09 21:52:16 +08:00
pengyuthon 1122bfa971 1 2025-10-09 21:49:53 +08:00
pengyuthon 8f8d98612c 1 2025-10-09 15:15:37 +08:00
pengyuthon 36f3491125 1 2025-10-09 15:01:05 +08:00
pengyuthon cb34ab87a5 1 2025-10-09 11:18:43 +08:00
pengyuthon 33ce538b7a 1 2025-10-08 21:21:04 +08:00
pengyuthon 048a2c9570 1 2025-10-08 21:12:47 +08:00
pengyuthon 17d8f91f78 1 2025-10-07 20:30:43 +08:00
pengyuthon b30073536e 1 2025-10-07 20:25:33 +08:00
pengyuthon d1a4e09612 1 2025-10-07 16:42:22 +08:00
pengyuthon dacf052740 1 2025-10-04 23:46:13 +08:00
pengyuthon c2024166e3 1 2025-10-04 16:35:45 +08:00
pengyuthon 3c660cabe0 1 2025-10-04 10:48:27 +08:00
pengyuthon 1d8999326e 1 2025-10-03 17:59:01 +08:00
pengyuthon 0cc67def5e 1 2025-10-03 17:54:35 +08:00
pengyuthon 9d14ccf4fc 1 2025-10-03 17:02:49 +08:00
pengyuthon 965713e2e6 水电表 2025-10-02 18:48:35 +08:00
pengyuthon 27dc609aa4 ljm:企业微信 消息推送 2024-07-03 22:12:50 +08:00
pengyuthon 82e16054c7 ljm:企业微信 消息推送 2024-07-03 22:11:28 +08:00
pengyuthon 10eb718159 ljm:企业微信员工创建用户 2024-07-03 21:49:03 +08:00
pengyuthon fe8bbcfed4 通知公告 2024-07-02 22:17:54 +08:00
pengyuthon 102752570e 企业微信 通步 2024-07-01 21:21:56 +08:00
pengyuthon 936f70e039 企业微信 通步 2024-07-01 20:41:30 +08:00
pengyuthon 9e92b1368e 企业微信 通步 2024-06-30 20:56:32 +08:00
pengyuthon e50f908657 企业微信 通步 2024-06-30 18:31:22 +08:00
pengyuthon ace090f017 企业微信 通步 2024-06-30 18:30:14 +08:00
pengyuthon 19f109c8ad 企业微信 通步 2024-06-30 18:27:46 +08:00
pengyuthon 76a477ae3b 议题相关 2024-06-29 22:26:34 +08:00
pengyuthon 03a6eb2ff7 议题相关 2024-06-27 15:37:08 +08:00
pengyuthon b2bb6ec37c 议题相关 2024-06-27 15:33:17 +08:00
pengyuthon ed4bb19768 议题相关 2024-06-27 15:24:00 +08:00
pengyuthon 1337189e45 议题相关 2024-06-27 14:59:25 +08:00
pengyuthon 0e2a3dafa5 议题相关 2024-06-27 14:16:47 +08:00
pengyuthon 9c9acaef0e ljm 企业微信 扫码登陆 居中 2024-06-26 18:44:31 +08:00
pengyuthon 3087ca21b6 ljm 企业微信 扫码登陆 居中 2024-06-25 22:44:38 +08:00
pengyuthon a6a70fae65 企业微信 扫码登陆 token验证 2024-06-24 22:39:31 +08:00
pengyuthon 20005a1a8f 主题 2024-06-24 18:41:50 +08:00
pengyuthon bdc901aa72 主题 2024-06-24 18:32:13 +08:00
pengyuthon 90b54f8668 主题 2024-06-24 18:16:47 +08:00
pengyuthon 9fae32fdcb 主题 2024-06-24 11:25:01 +08:00
pengyuthon 84dad8fa09 主题 2024-06-21 20:39:29 +08:00
pengyuthon db84904504 主题 2024-06-20 15:03:15 +08:00
pengyuthon e2886218ea 主题 2024-06-20 14:54:07 +08:00
pengyuthon 3ae1b45506 主题 2024-06-20 13:39:24 +08:00
pengyuthon 93d5692fa8 代码整合 2024-06-18 14:50:35 +08:00
pengyuthon 9e86876a51 代码整合 2024-06-18 14:50:18 +08:00
pengyuthon 1c57785c1e 考勤-法定节假日 2024-06-17 18:21:40 +08:00
pengyuthon 9f527098fb Merge branch 'master' into dev 2024-06-17 18:21:21 +08:00
pengyuthon d813491abd 考勤-法定节假日 2024-06-15 18:26:49 +08:00
pengyuthon 6b146d6d50 考勤-法定节假日 2024-06-15 18:25:43 +08:00
pengyuthon 851927bd37 考勤-法定节假日 2024-06-15 14:44:52 +08:00
pengyuthon b5775c4f0d Merge remote-tracking branch 'origin/dev' into dev
# Conflicts:
#	clarity_backend_theme_bits/__manifest__.py
#	clarity_backend_theme_bits/static/src/js/WebClient.js
#	clarity_backend_theme_bits/static/src/xml/navbar/sidebar.xml
#	clarity_backend_theme_bits/static/src/xml/systray_items/user_menu.xml
#	clarity_backend_theme_bits/views/res_config_setting.xml
#	clarity_backend_theme_bits/views/res_users.xml
2024-06-14 16:25:05 +08:00
pengyuthon d6cf1ff349 审批 2024-06-14 16:24:02 +08:00