Commit Graph

  • 02fda9646c 修改 jhc 2023-05-15 09:59:38 +0800
  • b640658f98 Merge branch 'oa' into dev jhc 2023-05-15 09:42:17 +0800
  • f6a7448cb3 修改 jhc 2023-05-15 09:42:02 +0800
  • 803fbd1030 Merge branch 'oa' into dev jhc 2023-05-15 09:21:08 +0800
  • ebc8f61f49 修改 jhc 2023-05-15 09:20:53 +0800
  • 4516cabe82 Merge branch 'oa' into dev jhc 2023-05-15 09:16:37 +0800
  • fd10885573 修改 jhc 2023-05-15 09:16:23 +0800
  • ed6665a70b Merge branch 'oa' into dev jhc 2023-05-12 17:39:51 +0800
  • 9e96e6310c 修改 jhc 2023-05-12 17:39:31 +0800
  • 9fcdbb5194 Merge branch 'oa' into dev jhc 2023-05-12 17:33:47 +0800
  • 815f7273db 修改 jhc 2023-05-12 17:33:33 +0800
  • 9f9ff4e3de Merge branch 'oa' into dev jhc 2023-05-12 17:29:23 +0800
  • 73075d6be9 修海 jhc 2023-05-12 17:29:04 +0800
  • f94041918f Merge branch 'oa' into dev jhc 2023-05-12 17:26:28 +0800
  • a55529b1bb 修改 jhc 2023-05-12 17:26:12 +0800
  • 708733e99a Merge branch 'oa' into dev jhc 2023-05-12 17:14:06 +0800
  • f4c7bc7b03 修改 jhc 2023-05-12 17:13:40 +0800
  • 19460c5fdc 修改冲突 jhc 2023-05-12 16:25:03 +0800
  • fc0865f83b 修改 jhc 2023-05-12 16:24:12 +0800
  • 58c1ab43f1 修改 jhc 2023-05-12 16:22:29 +0800
  • 83845f8037 Merge branch 'oa' into dev jhc 2023-05-12 16:17:26 +0800
  • 0e381a32dc 修改 jhc 2023-05-12 16:17:08 +0800
  • 5740aea1a3 Merge branch 'oa' into dev jhc 2023-05-12 16:08:56 +0800
  • 2061ae57f1 修改 jhc 2023-05-12 16:08:40 +0800
  • cc7ff8cf0e Merge branch 'oa' into dev jhc 2023-05-12 16:03:13 +0800
  • 8584515c4f 修改 jhc 2023-05-12 16:02:56 +0800
  • c26bc2f3a9 Merge branch 'oa' into dev jhc 2023-05-12 15:58:42 +0800
  • 5b97610544 修改问题 jhc 2023-05-12 15:58:26 +0800
  • de2ec5267c Merge branch 'oa' into dev jhc 2023-05-12 15:24:45 +0800
  • 0ec7533677 修改 jhc 2023-05-12 15:24:28 +0800
  • a24a215b35 修改 jhc 2023-05-12 15:16:36 +0800
  • 7e44924c18 Merge branch 'oa' into dev jhc 2023-05-12 15:11:50 +0800
  • 25a7a42329 修改 jhc 2023-05-12 15:11:36 +0800
  • 48a3a59c0f 取消 applyTimes 赋值 jhc 2023-05-12 14:54:28 +0800
  • a616b677ba Merge branch 'oa' into dev jhc 2023-05-12 14:50:31 +0800
  • 3a329b0a05 修改 jhc 2023-05-12 14:50:15 +0800
  • e5463203ee Merge branch 'oa' into dev jhc 2023-05-12 14:47:30 +0800
  • 568526bb23 输出 approval_oa jhc 2023-05-12 14:47:17 +0800
  • 97e59297ca Merge branch 'oa' into dev jhc 2023-05-12 14:38:33 +0800
  • b6b5b0e654 输出 approval_oa jhc 2023-05-12 14:38:17 +0800
  • 9095e3f01b Merge branch 'oa' into dev jhc 2023-05-12 14:33:58 +0800
  • 69e0b9858f 输出 approval_oag jhc 2023-05-12 14:33:40 +0800
  • 4fca4a1f98 Merge branch 'oa' into dev jhc 2023-05-12 14:27:28 +0800
  • 3840a48571 修改 赋值 jhc 2023-05-12 14:27:15 +0800
  • 88090ec1eb Merge branch 'oa' into dev jhc 2023-05-12 10:59:14 +0800
  • 9f29def7f2 更新 oa审批的uuid到审批 jhc 2023-05-12 10:58:35 +0800
  • ea8e5eb17f Merge branch 'oa' into dev jhc 2023-05-08 16:46:18 +0800
  • e1610eb019 调整 jhc 2023-05-08 16:46:05 +0800
  • 4d7f3a672f Merge branch 'oa' into dev jhc 2023-05-08 10:52:16 +0800
  • 874c6d377a oa审批 jhc 2023-05-08 10:52:00 +0800
  • 57397737d2 修改 pb jhc 2023-05-04 10:43:48 +0800
  • 844730ad0b 修改 jhc 2023-05-04 10:17:33 +0800
  • 05cc84845d 修改冲突 jhc 2023-05-04 10:15:50 +0800
  • 1e91eb3b7d 解决冲突 jhc 2023-04-27 13:49:33 +0800
  • c48a390a88 Merge branch 'jhc' into dev jhc 2023-04-26 20:48:55 +0800
  • 730e2b869e 修复 jhc 2023-04-26 20:48:38 +0800
  • a8ce2cb45e Merge branch 'jhc' into dev jhc 2023-04-26 20:46:12 +0800
  • aedf8f525a 画展包 添加经纪人字段 jhc 2023-04-26 20:45:52 +0800
  • 155c3d7477 Merge branch 'jhc' into dev jhc 2023-04-25 15:31:30 +0800
  • 2462790f40 修改 jhc 2023-04-25 15:27:49 +0800
  • e3e93400cb Merge branch 'jhc' into dev jhc 2023-04-25 15:25:47 +0800
  • f92a39033b 修改 jhc 2023-04-25 15:25:30 +0800
  • 5942b76a3f 修改 jhc 2023-04-25 15:17:46 +0800
  • 4c6a62a184 Merge branch 'jhc' into dev jhc 2023-04-25 14:42:33 +0800
  • 4d770592d1 调整 jhc 2023-04-25 14:42:24 +0800
  • 8553921da8 Merge branch 'jhc' into dev jhc 2023-04-25 14:15:25 +0800
  • 40d41ba7ea 修改 jhc 2023-04-25 14:15:05 +0800
  • b4a1074513 Merge branch 'jhc' into dev jhc 2023-04-25 13:30:52 +0800
  • f4bf38893d 添加 serializer:json jhc 2023-04-25 13:30:32 +0800
  • 9dd1d3bd53 Merge branch 'jhc' into dev jhc 2023-04-25 13:22:20 +0800
  • d8271cbbda 修改 copier复制 jhc 2023-04-25 13:22:06 +0800
  • 5c92502967 Merge branch 'jhc' into dev jhc 2023-04-25 11:56:25 +0800
  • 4b03c73db0 修改 pb jhc 2023-04-25 11:56:06 +0800
  • 9846c33fd1 Merge branch 'jhc' into dev jhc 2023-04-25 11:46:13 +0800
  • abf38c47d6 修改 财务报表审批 jhc 2023-04-25 11:46:00 +0800
  • 007da446bd 修改冲突 jhc 2023-04-25 11:09:49 +0800
  • 5ae4913fca 添加 财务报表审批 jhc 2023-04-25 11:07:00 +0800
  • a974e0def3 Merge branch 'jhc' into dev jhc 2023-04-24 19:38:14 +0800
  • b8ec6a70a6 修改 jhc 2023-04-24 19:37:56 +0800
  • 300e818750 Merge branch 'jhc' into dev jhc 2023-04-24 19:04:21 +0800
  • 357db1c143 财务报表审批 设置 jhc 2023-04-24 19:04:04 +0800
  • a769dd08bf oa 审批 未完成 jhc 2023-04-24 16:17:01 +0800
  • 131d247db7 Merge branch 'jhc' into dev jhc 2023-04-24 15:52:57 +0800
  • 06f56fc0b0 添加 财务表报审批类型 jhc 2023-04-24 15:52:43 +0800
  • da91d1e9be Merge branch 'jhc' into dev jhc 2023-04-21 15:30:55 +0800
  • 611fecad5d 修改 类型 jhc 2023-04-21 15:30:42 +0800
  • 41f30a1193 Merge branch 'jhc' into dev jhc 2023-04-21 15:11:28 +0800
  • 734b0a86a8 添加 oa 类型 jhc 2023-04-21 15:09:28 +0800
  • 1ab5b17c91 Merge branch 'jhc' jhc 2023-04-14 15:03:32 +0800
  • eee8529c77 Merge branch 'jhc' into dev jhc 2023-04-14 09:27:18 +0800
  • 44b76dc6ea 待阅读、已阅读列表 终极版 1.0 jhc 2023-04-14 09:26:09 +0800
  • 17f31ce8d0 Merge branch 'jhc' into dev jhc 2023-04-14 09:21:47 +0800
  • d157d072e5 待阅读、已阅读列表 终极版 jhc 2023-04-14 09:21:13 +0800
  • 28f61be90b Merge branch 'jhc' into dev jhc 2023-04-14 09:03:22 +0800
  • a018fc944f 取消 submitter 条件查询 jhc 2023-04-14 09:02:56 +0800
  • dea66c18d1 Merge branch 'jhc' into dev jhc 2023-04-13 20:15:15 +0800
  • b8eb4ebd0c 修改 待阅读和阅读 4.0 jhc 2023-04-13 20:14:58 +0800
  • e18b5efa84 Merge branch 'jhc' into dev jhc 2023-04-13 20:09:11 +0800
  • 9adf5a9acb 修改 待阅读和阅读 3.0 jhc 2023-04-13 20:08:55 +0800
  • 7974f8cea0 Merge branch 'dev' of http://192.168.12.3:8090/bugmaker/management_system/fonchain-approval into dev jhc 2023-04-13 19:06:27 +0800