Commit Graph
100 Commits
Author SHA1 Message Date
pengyuthon c3778f47cb 王 2026-02-22 10:18:52 +08:00
pengyuthon 55ac43a56c 开票类型调整 2026-02-20 21:15:36 +08:00
pengyuthon 9931fcd7f3 开票类型调整 2026-02-20 20:50:54 +08:00
pengyuthon 93a242f847 Merge branch 'master' into dev 2026-02-20 20:41:41 +08:00
pengyuthon 3aabfee22f Merge remote-tracking branch 'origin/dev' into dev 2026-02-20 20:37:27 +08:00
pengyuthon 5a8b424507 采购订单状态归档 2026-02-20 20:35:01 +08:00
李鹏宇 2c9a61633f !8929 !8928 添加功能
Merge pull request !8929 from 李鹏宇/dev
2026-02-14 09:07:04 +00:00
李鹏宇 7009060db4 !8928 添加功能
Merge pull request !8928 from 李鹏宇/dev_zhou
2026-02-14 09:06:40 +00:00
李鹏宇 9acf43ac25 !8927 !8926 添加功能
Merge pull request !8927 from 李鹏宇/dev
2026-02-14 08:43:55 +00:00
李鹏宇 5a648527c2 !8926 添加功能
Merge pull request !8926 from 李鹏宇/dev_zhou
2026-02-14 08:43:37 +00:00
李鹏宇 0cf0e24df7 !8925 工资条顺序
Merge pull request !8925 from 李鹏宇/dev
2026-02-14 04:02:29 +00:00
pengyuthon 0deca5c4cb 工资条顺序 2026-02-14 12:02:01 +08:00
李鹏宇 c3a966acfe !8924 工资条顺序
Merge pull request !8924 from 李鹏宇/dev
2026-02-14 01:53:08 +00:00
pengyuthon 5ebb14d719 工资条顺序 2026-02-14 09:49:51 +08:00
李鹏宇 a394c40088 !8923 !8922 字段顺序,金蝶导出
Merge pull request !8923 from 李鹏宇/dev
2026-02-13 14:29:15 +00:00
李鹏宇 61872463b8 !8922 字段顺序,金蝶导出
Merge pull request !8922 from 李鹏宇/dev_wang
2026-02-13 14:28:26 +00:00
李鹏宇 67eeb51cd4 字段顺序,金蝶导出 2026-02-13 22:25:05 +08:00
李鹏宇 b6c419039a !8921 Merge branch 'master' into dev
Merge pull request !8921 from 李鹏宇/dev
2026-02-13 09:33:54 +00:00
pengyuthon ace17caad1 Merge branch 'master' into dev 2026-02-13 17:33:29 +08:00
pengyuthon 88763e2ca5 薪资归档导入 2026-02-13 17:32:47 +08:00
李鹏宇 8818c0058d !8920 薪资归档导入
Merge pull request !8920 from 李鹏宇/dev
2026-02-13 09:15:11 +00:00
pengyuthon 04546a61b7 薪资归档导入 2026-02-13 17:14:32 +08:00
李鹏宇 01ceafa4da !8919 Merge remote-tracking branch 'origin/dev' into dev
Merge pull request !8919 from 李鹏宇/dev
2026-02-13 08:56:24 +00:00
pengyuthon e36f9d4d11 Merge remote-tracking branch 'origin/dev' into dev 2026-02-13 16:55:50 +08:00
pengyuthon 0c0023056b Merge remote-tracking branch 'origin/dev' into dev 2026-02-13 16:53:31 +08:00
pengyuthon 7db81d4319 薪资归档导入 2026-02-13 16:52:52 +08:00
李鹏宇 b992a4c8c6 !8918 !8917 添加功能
Merge pull request !8918 from 李鹏宇/dev
2026-02-13 04:06:16 +00:00
李鹏宇 2732bedd64 !8917 添加功能
Merge pull request !8917 from 李鹏宇/dev_zhou
2026-02-13 04:05:47 +00:00
李鹏宇 6d076f5bd1 !8916 !8915 添加功能
Merge pull request !8916 from 李鹏宇/dev
2026-02-13 04:00:11 +00:00
李鹏宇 2c3a6369ce !8915 添加功能
Merge pull request !8915 from 李鹏宇/dev_zhou
2026-02-13 03:59:48 +00:00
李鹏宇 5cd0f62328 !8914 !8913 添加功能
Merge pull request !8914 from 李鹏宇/dev
2026-02-13 03:58:45 +00:00
李鹏宇 73996fb729 !8913 添加功能
Merge pull request !8913 from 李鹏宇/dev_zhou
2026-02-13 03:58:24 +00:00
李鹏宇 fa4c7ed8be !8912 !8911 添加功能
Merge pull request !8912 from 李鹏宇/dev
2026-02-13 03:16:24 +00:00
李鹏宇 79d0c14f18 !8911 添加功能
Merge pull request !8911 from 李鹏宇/dev_zhou
2026-02-13 03:16:00 +00:00
李鹏宇 23657da485 !8910 !8909 添加功能
Merge pull request !8910 from 李鹏宇/dev
2026-02-13 03:06:03 +00:00
李鹏宇 5c8a16ac67 !8909 添加功能
Merge pull request !8909 from 李鹏宇/dev_zhou
2026-02-13 03:05:38 +00:00
李鹏宇 4de3801547 !8908 !8907 添加功能
Merge pull request !8908 from 李鹏宇/dev
2026-02-13 02:48:40 +00:00
李鹏宇 4af5f650d8 !8907 添加功能
Merge pull request !8907 from 李鹏宇/dev_zhou
2026-02-13 02:48:12 +00:00
李鹏宇 624bef0f13 !8906 !8905 添加功能
Merge pull request !8906 from 李鹏宇/dev
2026-02-12 13:27:23 +00:00
李鹏宇 5d4821b2d5 !8905 添加功能
Merge pull request !8905 from 李鹏宇/dev_zhou
2026-02-12 13:26:58 +00:00
李鹏宇 23e43b2e2d !8904 !8903 添加功能
Merge pull request !8904 from 李鹏宇/dev
2026-02-12 13:20:28 +00:00
李鹏宇 f3d02072e3 !8903 添加功能
Merge pull request !8903 from 李鹏宇/dev_zhou
2026-02-12 13:19:55 +00:00
李鹏宇 8df61da2b6 !8902 !8901 添加功能
Merge pull request !8902 from 李鹏宇/dev
2026-02-12 13:01:43 +00:00
李鹏宇 2f04aaf7a4 !8901 添加功能
Merge pull request !8901 from 李鹏宇/dev_zhou
2026-02-12 13:01:13 +00:00
李鹏宇 288c72cb81 !8900 !8899 添加功能
Merge pull request !8900 from 李鹏宇/dev
2026-02-12 10:16:11 +00:00
李鹏宇 e041b4b52a !8899 添加功能
Merge pull request !8899 from 李鹏宇/dev_zhou
2026-02-12 10:15:52 +00:00
李鹏宇 c6bf2d4a3d !8898 !8897 添加功能
Merge pull request !8898 from 李鹏宇/dev
2026-02-12 09:56:07 +00:00
李鹏宇 f3a6ca8556 !8897 添加功能
Merge pull request !8897 from 李鹏宇/dev_zhou
2026-02-12 09:55:36 +00:00
李鹏宇 f4b0be6001 !8896 !8895 添加功能
Merge pull request !8896 from 李鹏宇/dev
2026-02-12 09:40:01 +00:00
李鹏宇 75c0b0ac42 !8895 添加功能
Merge pull request !8895 from dev_zhou
2026-02-12 09:39:43 +00:00
李鹏宇 c164b59f9c !8894 !8893 添加功能
Merge pull request !8894 from 李鹏宇/dev
2026-02-12 08:49:33 +00:00
李鹏宇 88e8f56d0c !8893 添加功能
Merge pull request !8893 from 李鹏宇/dev_zhou
2026-02-12 08:48:57 +00:00
李鹏宇 8e8e669b54 !8892 !8891 添加功能
Merge pull request !8892 from 李鹏宇/dev
2026-02-12 07:57:51 +00:00
李鹏宇 8cfabd1552 !8891 添加功能
Merge pull request !8891 from 李鹏宇/dev_zhou
2026-02-12 07:57:28 +00:00
李鹏宇 d28e43d9e3 !8890 !8889 添加功能
Merge pull request !8890 from 李鹏宇/dev
2026-02-12 07:48:34 +00:00
李鹏宇 dc887179da !8889 添加功能
Merge pull request !8889 from 李鹏宇/dev_zhou
2026-02-12 07:48:15 +00:00
李鹏宇 3f503f749e !8888 !8887 添加功能
Merge pull request !8888 from 李鹏宇/dev
2026-02-12 07:34:26 +00:00
李鹏宇 b723c4db35 !8887 添加功能
Merge pull request !8887 from dev_zhou
2026-02-12 07:34:03 +00:00
李鹏宇 430d7f7134 !8886 !8885 添加功能
Merge pull request !8886 from 李鹏宇/dev
2026-02-12 07:14:31 +00:00
李鹏宇 632e351b74 !8885 添加功能
Merge pull request !8885 from 李鹏宇/dev_zhou
2026-02-12 07:14:13 +00:00
李鹏宇 cd7b614d7d !8884 !8883 添加功能
Merge pull request !8884 from 李鹏宇/dev
2026-02-12 07:00:45 +00:00
李鹏宇 0f7163ae7b !8883 添加功能
Merge pull request !8883 from 李鹏宇/dev_zhou
2026-02-12 07:00:26 +00:00
李鹏宇 5f32bbce76 !8882 流程结束会议相关审批
Merge pull request !8882 from 李鹏宇/dev
2026-02-12 03:26:53 +00:00
pengyuthon 80417791c3 流程结束会议相关审批 2026-02-12 11:25:45 +08:00
李鹏宇 721772c60d !8881 流程退回
Merge pull request !8881 from 李鹏宇/dev
2026-02-12 03:10:19 +00:00
pengyuthon c3606d838d 流程退回 2026-02-12 11:09:40 +08:00
李鹏宇 2b48c25b67 !8880 误餐提醒调整
Merge pull request !8880 from 李鹏宇/dev
2026-02-12 02:24:47 +00:00
pengyuthon ea271b662d 误餐提醒调整 2026-02-12 10:23:35 +08:00
pengyuthon 674e47fd42 误餐提醒调整 2026-02-12 10:20:51 +08:00
李鹏宇 5d07499228 !8879 误餐提醒调整
Merge pull request !8879 from 李鹏宇/dev
2026-02-12 02:02:06 +00:00
pengyuthon ec3c5311b7 误餐提醒调整 2026-02-12 10:01:11 +08:00
李鹏宇 3f84a4814b !8878 Merge branch 'master' into dev
Merge pull request !8878 from 李鹏宇/dev
2026-02-12 01:33:29 +00:00
pengyuthon 290ed5c19c Merge branch 'master' into dev 2026-02-12 09:31:46 +08:00
pengyuthon dcbc5695f6 Merge remote-tracking branch 'origin/dev' into dev 2026-02-12 09:31:43 +08:00
pengyuthon 3e49983449 误餐提醒调整 2026-02-12 09:29:50 +08:00
李鹏宇 b88a880bf9 !8877 !8876 Merge branch 'dev' of <a href="https://gitee.com/jinan-pengyusen…
Merge pull request !8877 from 李鹏宇/dev
2026-02-11 13:08:58 +00:00
李鹏宇 81c02cea1a !8876 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 !8876 from 李鹏宇/dev_wang
2026-02-11 13:08:35 +00:00
李鹏宇 d6183822cc Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-11 21:07:09 +08:00
李鹏宇 ab8f4c35c0 批量开票导出 2026-02-11 21:06:46 +08:00
李鹏宇 6b2f5c4543 !8875 Merge remote-tracking branch 'origin/dev' into dev
Merge pull request !8875 from 李鹏宇/dev
2026-02-11 11:33:02 +00:00
pengyuthon deedf6e3ae Merge remote-tracking branch 'origin/dev' into dev 2026-02-11 19:32:20 +08:00
pengyuthon 7a40c78550 误餐导入调整 2026-02-11 19:30:26 +08:00
李鹏宇 8cf1f157cb !8874 !8873 Merge branch 'dev' of &lt;a href="https://gitee.com/jinan-pengyusen…
Merge pull request !8874 from 李鹏宇/dev
2026-02-11 09:28:37 +00:00
李鹏宇 c13ca66aff !8873 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 !8873 from 李鹏宇/dev_wang
2026-02-11 09:28:13 +00:00
李鹏宇 3b437ef958 Merge branch 'dev' of https://gitee.com/jinan-pengyusen-data/gzth into dev_wang 2026-02-11 17:27:42 +08:00
李鹏宇 b569cf0192 金蝶云字段,搜索,排序 2026-02-11 17:27:28 +08:00
李鹏宇 cd010c3289 !8872 议题跳转详情按钮
Merge pull request !8872 from 李鹏宇/dev
2026-02-11 08:25:16 +00:00
pengyuthon 965781e1a9 议题跳转详情按钮 2026-02-11 16:24:08 +08:00
李鹏宇 ab0c7c79f5 !8871 Merge remote-tracking branch 'origin/dev' into dev
Merge pull request !8871 from 李鹏宇/dev
2026-02-11 07:41:43 +00:00
pengyuthon da1c6033fe Merge branch 'master' into dev 2026-02-11 15:41:17 +08:00
pengyuthon b7ca27637a Merge remote-tracking branch 'origin/dev' into dev 2026-02-11 15:40:41 +08:00
pengyuthon 2890be48a1 物业变更结束报错,和消息通知room booking 2026-02-11 15:38:35 +08:00
李鹏宇 276ae17b2b !8870 !8869 添加功能
Merge pull request !8870 from 李鹏宇/dev
2026-02-11 02:59:19 +00:00
李鹏宇 df3dd0dd7e !8869 添加功能
Merge pull request !8869 from 李鹏宇/dev_zhou
2026-02-11 02:58:51 +00:00
李鹏宇 b02bb79816 !8868 !8867 添加功能
Merge pull request !8868 from 李鹏宇/dev
2026-02-11 02:43:16 +00:00
李鹏宇 59a2b02e32 !8867 添加功能
Merge pull request !8867 from 李鹏宇/dev_zhou
2026-02-11 02:42:53 +00:00
李鹏宇 85d8d54f47 !8866 小程序操作优化
Merge pull request !8866 from 李鹏宇/dev
2026-02-11 01:50:18 +00:00
pengyuthon 2fd2e40b3e 小程序操作优化 2026-02-11 09:49:38 +08:00
pengyuthon ef9ecfd99e 归档附件 2026-02-11 09:46:50 +08:00
李鹏宇 e36f94e13b !8865 工作流优化
Merge pull request !8865 from 李鹏宇/dev
2026-02-10 16:07:00 +00:00