Commit Graph

256 Commits

Author SHA1 Message Date
jhc
57397737d2 修改 pb 2023-05-04 10:43:48 +08:00
jhc
844730ad0b 修改 2023-05-04 10:17:33 +08:00
jhc
05cc84845d 修改冲突 2023-05-04 10:15:50 +08:00
jhc
1e91eb3b7d 解决冲突 2023-04-27 13:49:33 +08:00
jhc
c48a390a88 Merge branch 'jhc' into dev 2023-04-26 20:48:55 +08:00
jhc
730e2b869e 修复 2023-04-26 20:48:38 +08:00
jhc
a8ce2cb45e Merge branch 'jhc' into dev 2023-04-26 20:46:12 +08:00
jhc
aedf8f525a 画展包 添加经纪人字段 2023-04-26 20:45:52 +08:00
jhc
155c3d7477 Merge branch 'jhc' into dev 2023-04-25 15:31:30 +08:00
jhc
2462790f40 修改 2023-04-25 15:27:49 +08:00
jhc
e3e93400cb Merge branch 'jhc' into dev 2023-04-25 15:25:47 +08:00
jhc
f92a39033b 修改 2023-04-25 15:25:30 +08:00
jhc
5942b76a3f 修改 2023-04-25 15:17:46 +08:00
jhc
4c6a62a184 Merge branch 'jhc' into dev 2023-04-25 14:42:33 +08:00
jhc
4d770592d1 调整 2023-04-25 14:42:24 +08:00
jhc
8553921da8 Merge branch 'jhc' into dev 2023-04-25 14:15:25 +08:00
jhc
40d41ba7ea 修改 2023-04-25 14:15:05 +08:00
jhc
b4a1074513 Merge branch 'jhc' into dev 2023-04-25 13:30:52 +08:00
jhc
f4bf38893d 添加 serializer:json 2023-04-25 13:30:32 +08:00
jhc
9dd1d3bd53 Merge branch 'jhc' into dev 2023-04-25 13:22:20 +08:00
jhc
d8271cbbda 修改 copier复制 2023-04-25 13:22:06 +08:00
jhc
5c92502967 Merge branch 'jhc' into dev 2023-04-25 11:56:25 +08:00
jhc
4b03c73db0 修改 pb 2023-04-25 11:56:06 +08:00
jhc
9846c33fd1 Merge branch 'jhc' into dev 2023-04-25 11:46:13 +08:00
jhc
abf38c47d6 修改 财务报表审批 2023-04-25 11:46:00 +08:00
jhc
007da446bd 修改冲突 2023-04-25 11:09:49 +08:00
jhc
5ae4913fca 添加 财务报表审批 2023-04-25 11:07:00 +08:00
jhc
a974e0def3 Merge branch 'jhc' into dev 2023-04-24 19:38:14 +08:00
jhc
b8ec6a70a6 修改 2023-04-24 19:37:56 +08:00
jhc
300e818750 Merge branch 'jhc' into dev 2023-04-24 19:04:21 +08:00
jhc
357db1c143 财务报表审批 设置 2023-04-24 19:04:04 +08:00
jhc
a769dd08bf oa 审批 未完成 2023-04-24 16:17:01 +08:00
jhc
131d247db7 Merge branch 'jhc' into dev 2023-04-24 15:52:57 +08:00
jhc
06f56fc0b0 添加 财务表报审批类型 2023-04-24 15:52:43 +08:00
jhc
da91d1e9be Merge branch 'jhc' into dev 2023-04-21 15:30:55 +08:00
jhc
611fecad5d 修改 类型 2023-04-21 15:30:42 +08:00
jhc
41f30a1193 Merge branch 'jhc' into dev 2023-04-21 15:11:28 +08:00
jhc
734b0a86a8 添加 oa 类型 2023-04-21 15:09:28 +08:00
jhc
1ab5b17c91 Merge branch 'jhc' 2023-04-14 15:03:32 +08:00
jhc
eee8529c77 Merge branch 'jhc' into dev 2023-04-14 09:27:18 +08:00
jhc
44b76dc6ea 待阅读、已阅读列表 终极版 1.0 2023-04-14 09:26:09 +08:00
jhc
17f31ce8d0 Merge branch 'jhc' into dev 2023-04-14 09:21:47 +08:00
jhc
d157d072e5 待阅读、已阅读列表 终极版 2023-04-14 09:21:13 +08:00
jhc
28f61be90b Merge branch 'jhc' into dev 2023-04-14 09:03:22 +08:00
jhc
a018fc944f 取消 submitter 条件查询 2023-04-14 09:02:56 +08:00
jhc
dea66c18d1 Merge branch 'jhc' into dev 2023-04-13 20:15:15 +08:00
jhc
b8eb4ebd0c 修改 待阅读和阅读 4.0 2023-04-13 20:14:58 +08:00
jhc
e18b5efa84 Merge branch 'jhc' into dev 2023-04-13 20:09:11 +08:00
jhc
9adf5a9acb 修改 待阅读和阅读 3.0 2023-04-13 20:08:55 +08:00
jhc
7974f8cea0 Merge branch 'dev' of http://192.168.12.3:8090/bugmaker/management_system/fonchain-approval into dev 2023-04-13 19:06:27 +08:00