Commit Graph

Select branches

Hide Pull Requests

lym

main

Mono Color

• c1f5962c65 删除api/approval lym luyanming 2023-06-21 17:07:04 +0800
• a3345f35aa 修改proto文件 luyanming 2023-06-21 15:36:15 +0800
• fbdd1f8015 修改导入包名 main luyanming 2023-06-21 15:04:45 +0800
• 59a540080e 初始化仓库 luyanming 2023-06-21 14:54:47 +0800
• c181cc2700 Merge branch 'main' of http://192.168.12.3:3000/fonchain/fonchain-approval jhc 2023-06-15 16:35:21 +0800
• fc00312c7f Merge branch 'jhc' jhc 2023-06-15 16:22:09 +0800
• ee8fae3bbb 修改 jhc 2023-06-15 15:49:00 +0800
• f21ac0b125 feat k8s配置 gy 2023-06-14 18:56:47 +0800
• b9e7ccc9a4 修改 jhc 2023-06-14 09:34:34 +0800
• f3327d15b5 修改 jhc 2023-06-14 09:28:19 +0800
• 18f707abe6 修改 jhc 2023-06-14 09:24:22 +0800
• 2b7392956d 修改 jhc 2023-06-14 09:22:10 +0800
• 2a0e0c1cd5 修改 jhc 2023-06-13 19:56:26 +0800
• 9b0ba0dde3 修改 jhc 2023-06-13 19:50:31 +0800
• e94b669757 修改 jhc 2023-06-13 19:36:15 +0800
• 142fb4d89d 修改 jhc 2023-06-13 19:26:59 +0800
• 7af578eeda 修改 jhc 2023-06-13 19:05:00 +0800
• df62cc932e 修改 jhc 2023-06-13 18:27:44 +0800
• 1e8243fb76 修改 jhc 2023-06-13 18:22:41 +0800
• ad04688e2d 修改 jhc 2023-06-13 18:13:26 +0800
• 227faf717d 修改 jhc 2023-06-13 18:01:57 +0800
• cd29c2a85d 修改 jhc 2023-06-13 17:56:21 +0800
• 8064359d26 xiugai jhc 2023-06-13 17:12:36 +0800
• 559f1e2b4d 修改判断条件 jhc 2023-06-13 17:08:25 +0800
• f0ab4a944a 修改 jhc 2023-06-13 17:04:14 +0800
• adeae10479 修改搜索条件设置 jhc 2023-06-13 16:55:25 +0800
• 4e23a6722c 修改 jhc 2023-06-13 16:51:20 +0800
• 2543d474be 修改 jhc 2023-06-13 16:46:07 +0800
• 072ee59c55 修改 jhc 2023-06-13 16:34:03 +0800
• 1a5d282ce2 修改 jhc 2023-06-13 15:13:32 +0800
• adab168f02 修改 jhc 2023-06-13 15:09:50 +0800
• fd60fa490b 修改 jhc 2023-06-13 15:05:27 +0800
• ca5f5e2369 修改 jhc 2023-06-13 15:04:36 +0800
• 49c8d6a454 时间搜索 jhc 2023-06-13 14:53:34 +0800
• efcd9fcdce 有搜索条件时,查询全部审批,不包含抄送 jhc 2023-06-13 14:40:39 +0800
• 00830ff6e8 全部审批 修改查询条件 jhc 2023-06-13 13:18:58 +0800
• cf150b00c8 审批添加搜索条件 jhc 2023-06-13 11:46:35 +0800
• 044b1bf0eb 修改冲突 jhc 2023-06-02 16:19:33 +0800
• 0431b6f003 重新生成pb 文件 jhc 2023-06-02 11:58:14 +0800
• fdbd0b8680 删除 approval文件夹 jhc 2023-06-02 11:52:40 +0800
• bde6592a2a 删除 pb 文件 jhc 2023-06-02 11:51:19 +0800
• f01f5b6418 Merge branch 'jhc' into dev jhc 2023-06-02 11:43:29 +0800
• 90d35a9548 修改 pb jhc 2023-06-02 11:43:13 +0800
• 34697d8c46 Merge branch 'jhc' into dev jhc 2023-06-02 11:37:00 +0800
• 15bc70493b xiugai jhc 2023-06-02 11:36:38 +0800
• 84aab43644 Merge branch 'jhc' into dev jhc 2023-06-02 11:31:26 +0800
• 71f53107c3 空提交 jhc 2023-06-02 11:31:11 +0800
• 5447cee77b 修改冲突 jhc 2023-06-02 11:00:43 +0800
• 3367b8c26f 修改冲突 jhc 2023-06-02 10:51:10 +0800
• 978ff2f882 付款单 添加 操作数量字段 jhc 2023-06-02 10:46:46 +0800
• b4c3f301da Merge branch 'oa' into dev jhc 2023-05-29 14:24:19 +0800
• 15db7ce413 更新 leaveApply jhc 2023-05-29 14:24:00 +0800
• 9feeb51a08 Merge branch 'oa' into dev jhc 2023-05-29 13:42:10 +0800
• dcebb9942b 修改更新 jhc 2023-05-29 13:41:59 +0800
• 91e973f204 Merge branch 'oa' into dev jhc 2023-05-29 13:35:27 +0800
• 6ccf358f6c 修改 jhc 2023-05-29 13:34:35 +0800
• f84a045456 Merge branch 'oa' into dev jhc 2023-05-29 13:06:37 +0800
• ff228f6f7a 修改 jhc 2023-05-29 13:06:24 +0800
• 06f02d07bd Merge branch 'oa' into dev jhc 2023-05-29 10:20:55 +0800
• 0fcfc7926f setStatus 添加 leaveBalance字段 jhc 2023-05-29 10:20:45 +0800
• 1001127d11 Merge branch 'jhc' jhc 2023-05-23 15:00:27 +0800
• 26dd1a5672 添加 字段 rollback jhc 2023-05-23 15:00:04 +0800
• a3c32ee58e Merge branch 'jhc' jhc 2023-05-23 14:51:26 +0800
• 732d6fbe30 添加 rollback jhc 2023-05-23 14:51:03 +0800
• ad7b63161e Merge branch 'oa' into dev jhc 2023-05-23 10:33:09 +0800
• fee84e25a5 修改 oa审批 jhc 2023-05-23 10:32:53 +0800
• d0c37c9587 Merge branch 'oa' into dev jhc 2023-05-22 15:26:05 +0800
• c30f372cd4 修改 staffUID 类型 jhc 2023-05-22 15:25:45 +0800
• b0c08f0cde Merge branch 'oa' into dev jhc 2023-05-18 18:35:56 +0800
• 42b13a6945 修改 jhc 2023-05-18 18:35:42 +0800
• 7d61d8b0c7 Merge branch 'oa' into dev jhc 2023-05-18 18:32:30 +0800
• 19fcc01688 修改 jhc 2023-05-18 18:32:17 +0800
• 94950c1fbb Merge branch 'oa' into dev jhc 2023-05-18 18:23:58 +0800
• d7af19ef70 修改 jhc 2023-05-18 18:23:49 +0800
• b9b389e25c Merge branch 'oa' into dev jhc 2023-05-18 18:21:37 +0800
• 69d84a0efc 修改 jhc 2023-05-18 18:21:20 +0800
• 025d306d67 Merge branch 'oa' into dev jhc 2023-05-18 18:13:12 +0800
• a39facfe63 修改 jhc 2023-05-18 18:12:58 +0800
• 520b11b369 Merge branch 'oa' into dev jhc 2023-05-18 16:13:41 +0800
• b58c70825f oa 审批 类型筛选 jhc 2023-05-18 16:13:28 +0800
• 1c684b3f2a Merge branch 'oa' into dev jhc 2023-05-16 16:29:41 +0800
• 9fc156be43 leaveApply 添加 leaveBalance jhc 2023-05-16 16:29:29 +0800
• 58b79614af Merge branch 'oa' into dev jhc 2023-05-16 15:42:38 +0800
• 65a53f905d leaveApply 添加 leaveBalance 字段 jhc 2023-05-16 15:42:19 +0800
• 2ce5ae8dd6 Merge branch 'oa' into dev jhc 2023-05-16 13:30:42 +0800
• 2c5f6df7e8 添加 输出 jhc 2023-05-16 13:30:31 +0800
• b770c2de2c 修改 update oa jhc 2023-05-16 13:28:23 +0800
• ec7fe28657 Merge branch 'oa' into dev jhc 2023-05-16 11:57:16 +0800
• 8518a5e877 修改 jhc 2023-05-16 11:57:06 +0800
• ddc1b4f554 Merge branch 'oa' into dev jhc 2023-05-16 11:01:17 +0800
• 88c6f7b29a 修改 jhc 2023-05-16 11:00:59 +0800
• 1750437dfb Merge branch 'oa' into dev jhc 2023-05-16 10:52:38 +0800
• 8588b16469 添加字段 BundlePayPrice -> rollback jhc 2023-05-16 10:52:24 +0800
• 8f5015a173 Merge branch 'oa' into dev jhc 2023-05-16 10:46:21 +0800
• 660bbce0c9 修改,画展包付款单添加rollback jhc 2023-05-16 10:46:04 +0800
• 138e9087e1 Merge branch 'oa' into dev jhc 2023-05-15 10:24:20 +0800
• e23bab0b50 修改 jhc 2023-05-15 10:24:07 +0800
• 55c61ec640 Merge branch 'oa' into dev jhc 2023-05-15 10:16:19 +0800
• 7edc94505a 修改 jhc 2023-05-15 10:15:59 +0800
• e7f3e6f5ad Merge branch 'oa' into dev jhc 2023-05-15 09:59:50 +0800