jhc
|
c26bc2f3a9
|
Merge branch 'oa' into dev
|
2023-05-12 15:58:42 +08:00 |
|
jhc
|
5b97610544
|
修改问题
|
2023-05-12 15:58:26 +08:00 |
|
jhc
|
de2ec5267c
|
Merge branch 'oa' into dev
|
2023-05-12 15:24:45 +08:00 |
|
jhc
|
0ec7533677
|
修改
|
2023-05-12 15:24:28 +08:00 |
|
jhc
|
a24a215b35
|
修改
|
2023-05-12 15:16:36 +08:00 |
|
jhc
|
7e44924c18
|
Merge branch 'oa' into dev
|
2023-05-12 15:11:50 +08:00 |
|
jhc
|
25a7a42329
|
修改
|
2023-05-12 15:11:36 +08:00 |
|
jhc
|
48a3a59c0f
|
取消 applyTimes 赋值
|
2023-05-12 14:54:28 +08:00 |
|
jhc
|
a616b677ba
|
Merge branch 'oa' into dev
|
2023-05-12 14:50:31 +08:00 |
|
jhc
|
3a329b0a05
|
修改
|
2023-05-12 14:50:15 +08:00 |
|
jhc
|
e5463203ee
|
Merge branch 'oa' into dev
|
2023-05-12 14:47:30 +08:00 |
|
jhc
|
568526bb23
|
输出 approval_oa
|
2023-05-12 14:47:17 +08:00 |
|
jhc
|
97e59297ca
|
Merge branch 'oa' into dev
|
2023-05-12 14:38:33 +08:00 |
|
jhc
|
b6b5b0e654
|
输出 approval_oa
|
2023-05-12 14:38:17 +08:00 |
|
jhc
|
9095e3f01b
|
Merge branch 'oa' into dev
|
2023-05-12 14:33:58 +08:00 |
|
jhc
|
69e0b9858f
|
输出 approval_oag
|
2023-05-12 14:33:40 +08:00 |
|
jhc
|
4fca4a1f98
|
Merge branch 'oa' into dev
|
2023-05-12 14:27:28 +08:00 |
|
jhc
|
3840a48571
|
修改 赋值
|
2023-05-12 14:27:15 +08:00 |
|
jhc
|
88090ec1eb
|
Merge branch 'oa' into dev
|
2023-05-12 10:59:14 +08:00 |
|
jhc
|
9f29def7f2
|
更新 oa审批的uuid到审批
|
2023-05-12 10:58:35 +08:00 |
|
jhc
|
ea8e5eb17f
|
Merge branch 'oa' into dev
|
2023-05-08 16:46:18 +08:00 |
|
jhc
|
e1610eb019
|
调整
|
2023-05-08 16:46:05 +08:00 |
|
jhc
|
4d7f3a672f
|
Merge branch 'oa' into dev
|
2023-05-08 10:52:16 +08:00 |
|
jhc
|
874c6d377a
|
oa审批
|
2023-05-08 10:52:00 +08:00 |
|
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
|
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 |
|